diff --git a/htdocs/application/libraries/geshi/contrib/aliased.php b/htdocs/application/libraries/geshi/contrib/aliased.php
index 0d4b283..fb8c4fb 100644
--- a/htdocs/application/libraries/geshi/contrib/aliased.php
+++ b/htdocs/application/libraries/geshi/contrib/aliased.php
@@ -18,11 +18,23 @@
 // Your config here
 define("SOURCE_ROOT", "/var/www/your/source/root/");
 
-// Assume you've put geshi in the include_path already
-require_once("geshi.php");
+if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    //composer install
+    require __DIR__ . '/../vendor/autoload.php';
+} else if (file_exists(__DIR__ . '/../src/geshi.php')) {
+    //git checkout
+    require __DIR__ . '/../src/geshi.php';
+} else {
+    // Assume you've put geshi in the include_path already
+    require_once("geshi.php");
+}
+
+if (!isset($_SERVER['PATH_INFO'])) {
+    die("No file name given.\n");
+}
 
 // Get path info
-$path = SOURCE_ROOT.$_SERVER['PATH_INFO'];
+$path = SOURCE_ROOT . $_SERVER['PATH_INFO'];
 
 // Check for dickheads trying to use '../' to get to sensitive areas
 $base_path_len = strlen(SOURCE_ROOT);
diff --git a/htdocs/application/libraries/geshi/contrib/cssgen.php b/htdocs/application/libraries/geshi/contrib/cssgen.php
index d0dac0f..6de4346 100644
--- a/htdocs/application/libraries/geshi/contrib/cssgen.php
+++ b/htdocs/application/libraries/geshi/contrib/cssgen.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/05/20
  *
  * Application to generate custom CSS files for GeSHi (based on an idea by Andreas
@@ -30,7 +30,6 @@
  *
  ************************************************************************************/
 
-set_magic_quotes_runtime(0);
 //
 // Functions
 //
@@ -165,21 +164,23 @@ if ( !$step || $step == 1 )
     $geshi_lang_path = get_var('geshi-lang-path');
 
     if(strstr($geshi_path, '..')) {
-        unset($geshi_path);
+        $geshi_path = null;
     }
     if(strstr($geshi_lang_path, '..')) {
-        unset($geshi_lang_path);
+        $geshi_lang_path = null;
     }
 
     if ( !$geshi_path )
     {
-        $geshi_path = '../geshi.php';
+        $geshi_path = '../src/geshi.php';
     }
     if ( !$geshi_lang_path )
     {
-        $geshi_lang_path = '../geshi/';
+        $geshi_lang_path = '../src/geshi/';
     }
 
+    $no_geshi_dot_php_error = false;
+    $no_lang_dir_error = false;
     if ( is_file($geshi_path) && is_readable($geshi_path) )
     {
         // Get file contents and see if GeSHi is in here
diff --git a/htdocs/application/libraries/geshi/contrib/cssgen2.php b/htdocs/application/libraries/geshi/contrib/cssgen2.php
index cc3c39c..72a2b0f 100644
--- a/htdocs/application/libraries/geshi/contrib/cssgen2.php
+++ b/htdocs/application/libraries/geshi/contrib/cssgen2.php
@@ -28,19 +28,19 @@
  *
  */
 
-require dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'geshi.php';
-$geshi = new GeSHi;
-
-$languages = array();
-if ($handle = opendir($geshi->language_path)) {
-    while (($file = readdir($handle)) !== false) {
-        $pos = strpos($file, '.');
-        if ($pos > 0 && substr($file, $pos) == '.php') {
-            $languages[] = substr($file, 0, $pos);
-        }
-    }
-    closedir($handle);
+if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    //composer install
+    require __DIR__ . '/../vendor/autoload.php';
+} else if (file_exists(__DIR__ . '/../src/geshi.php')) {
+    //git checkout
+    require __DIR__ . '/../src/geshi.php';
+} else {
+    // Assume you've put geshi in the include_path already
+    require_once "geshi.php";
 }
+
+$geshi = new GeSHi();
+$languages = $geshi->get_supported_languages();
 sort($languages);
 
 header('Content-Type: application/octet-stream');
diff --git a/htdocs/application/libraries/geshi/contrib/example.php b/htdocs/application/libraries/geshi/contrib/example.php
index 1ad923d..c5c1cc1 100644
--- a/htdocs/application/libraries/geshi/contrib/example.php
+++ b/htdocs/application/libraries/geshi/contrib/example.php
@@ -15,14 +15,16 @@ error_reporting(E_ALL);
 // Rudimentary checking of where GeSHi is. In a default install it will be in ../, but
 // it could be in the current directory if the include_path is set. There's nowhere else
 // we can reasonably guess.
-if (is_readable('../geshi.php')) {
-    $path = '../';
-} elseif (is_readable('geshi.php')) {
-    $path = './';
+if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    //composer install
+    require __DIR__ . '/../vendor/autoload.php';
+} else if (file_exists(__DIR__ . '/../src/geshi.php')) {
+    //git checkout
+    require __DIR__ . '/../src/geshi.php';
 } else {
-    die('Could not find geshi.php - make sure it is in your include path!');
+    // Assume you've put geshi in the include_path already
+    require_once("geshi.php");
 }
-require $path . 'geshi.php';
 
 $fill_source = false;
 if (isset($_POST['submit'])) {
@@ -94,6 +96,7 @@ if (isset($_POST['submit'])) {
 } else {
     // make sure we don't preselect any language
     $_POST['language'] = null;
+    $geshi = new GeSHi();
 }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -178,20 +181,10 @@ if (isset($_POST['submit'])) {
 <p>
 <select name="language" id="language">
 <?php
-if (!($dir = @opendir(dirname(__FILE__) . '/geshi'))) {
-    if (!($dir = @opendir(dirname(__FILE__) . '/../geshi'))) {
-        echo '<option>No languages available!</option>';
-    }
+$languages = $geshi->get_supported_languages();
+if (!count($languages)) {
+    echo '<option>No languages available!</option>';
 }
-$languages = array();
-while ($file = readdir($dir)) {
-    if ( $file[0] == '.' || strpos($file, '.', 1) === false) {
-        continue;
-    }
-    $lang = substr($file, 0,  strpos($file, '.'));
-    $languages[] = $lang;
-}
-closedir($dir);
 sort($languages);
 foreach ($languages as $lang) {
     if (isset($_POST['language']) && $_POST['language'] == $lang) {
diff --git a/htdocs/application/libraries/geshi/contrib/langcheck.php b/htdocs/application/libraries/geshi/contrib/langcheck.php
deleted file mode 100644
index ce5aed1..0000000
--- a/htdocs/application/libraries/geshi/contrib/langcheck.php
+++ /dev/null
@@ -1,778 +0,0 @@
-<?php
-/**
- * GeSHi language file validation script
- *
- * Just point your browser at this script (with geshi.php in the parent directory)
- * and the language files in subdirectory "../geshi/" are being validated
- *
- * CLI mode is supported
- *
- * @author  Benny Baumann
- * @version $Id$
- */
-header('Content-Type: text/html; charset=utf-8');
-
-set_time_limit(0);
-error_reporting(E_ALL);
-$time_start = explode(' ', microtime());
-
-function colorize($level, $string) {
-    static $colors, $end;
-    if ( !isset($colors) ) {
-      if ( PHP_SAPI != 'cli' ) {
-          $end = '</span>';
-          $colors = array(
-              TYPE_NOTICE => '<span style="color:#080;font-weight:bold;">',
-              TYPE_WARNING => '<span style="color:#CC0; font-weight: bold;">',
-              TYPE_ERROR => '<span style="color:#F00; font-weight: bold;">',
-              TYPE_OK => '<span style="color: #080; font-weight: bold;">'
-          );
-      } else {
-          $end = chr(27).'[0m';
-          $colors = array(
-              TYPE_NOTICE => chr(27).'[1m',
-              TYPE_WARNING => chr(27).'[1;33m',
-              TYPE_ERROR => chr(27).'[1;31m',
-              TYPE_OK => chr(27).'[1;32m'
-          );
-      }
-    }
-
-    if ( !isset($colors[$level]) ) {
-        trigger_error("no colors for level $level", E_USER_ERROR);
-    }
-
-    return $colors[$level].$string.$end;
-}
-
-define ('TYPE_NOTICE', 0);
-define ('TYPE_WARNING', 1);
-define ('TYPE_ERROR', 2);
-define ('TYPE_OK', 3);
-
-$error_abort = false;
-$error_cache = array();
-function output_error_cache(){
-    global $error_cache;
-
-    if(count($error_cache)) {
-        echo colorize(TYPE_ERROR, "Failed");
-        if ( PHP_SAPI == 'cli' ) {
-            echo "\n\n";
-        } else {
-            echo "<br /><ol>\n";
-        }
-        foreach($error_cache as $error_msg) {
-            if ( PHP_SAPI == 'cli' ) {
-              echo "\n";
-            } else {
-              echo "<li>";
-            }
-            switch($error_msg['t']) {
-                case TYPE_NOTICE:
-                    $msg = 'NOTICE';
-                    break;
-                case TYPE_WARNING:
-                    $msg = 'WARNING';
-                    break;
-                case TYPE_ERROR:
-                    $msg = 'ERROR';
-                    break;
-            }
-            echo colorize($error_msg['t'], $msg);
-            if ( PHP_SAPI == 'cli' ) {
-                echo "\t" . $error_msg['m'];
-            } else {
-                echo " " . $error_msg['m'] . "</li>";
-            }
-        }
-        if ( PHP_SAPI == 'cli' ) {
-            echo "\n";
-        } else {
-            echo "</ol>\n";
-        }
-    } else {
-        echo colorize(TYPE_OK, "OK");
-        if ( PHP_SAPI == 'cli' ) {
-            echo "\n";
-        } else {
-            echo "\n<br />";
-        }
-    }
-    echo "\n";
-
-    $error_cache = array();
-}
-
-function report_error($type, $message) {
-    global $error_cache, $error_abort;
-
-    $error_cache[] = array('t' => $type, 'm' => $message);
-    if(TYPE_ERROR == $type) {
-        $error_abort = true;
-    }
-}
-
-function dupfind_strtolower(&$value){
-    $value = strtolower($value);
-}
-
-if ( PHP_SAPI != 'cli' ) { ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>GeSHi Language File Validation Script</title>
-    <style type="text/css">
-    <!--
-    html {
-        background-color: #f0f0f0;
-    }
-    body {
-        font-family: Verdana, Arial, sans-serif;
-        margin: 10px;
-        border: 2px solid #e0e0e0;
-        background-color: #fcfcfc;
-        padding: 5px;
-        font-size: 10pt;
-    }
-    h2 {
-        margin: .1em 0 .2em .5em;
-        border-bottom: 1px solid #b0b0b0;
-        color: #b0b0b0;
-        font-weight: normal;
-        font-size: 150%;
-    }
-    h3 {
-        margin: .1em 0 .2em .5em;
-        color: #b0b0b0;
-        font-weight: normal;
-        font-size: 120%;
-    }
-    #footer {
-        text-align: center;
-        font-size: 80%;
-        color: #a9a9a9;
-    }
-    #footer a {
-        color: #9999ff;
-    }
-    textarea {
-        border: 1px solid #b0b0b0;
-        font-size: 90%;
-        color: #333;
-        margin-left: 20px;
-    }
-    select, input {
-        margin-left: 20px;
-    }
-    p {
-        font-size: 90%;
-        margin-left: .5em;
-    }
-    -->
-    </style>
-</head>
-<body>
-<h2>GeSHi Language File Validation Script</h2>
-<p>To use this script, make sure that <strong>geshi.php</strong> is in the
-parent directory or in your include_path, and that the language files are in a
-subdirectory of GeSHi's directory called <strong>geshi/</strong>.</p>
-<p>Everything else will be done by this script automatically. After the script
-finished you should see messages of what could cause trouble with GeSHi or where
-your language files can be improved. Please be patient, as this might take some time.</p>
-
-<ol>
-<li>Checking where to find GeSHi installation ...<?php
-} else { ?>
-<?php echo colorize(TYPE_NOTICE, "#### GeSHi Language File Validation Script ####") ?>
-
-
-To use this script, make sure that <?php echo colorize(TYPE_NOTICE, "geshi.php"); ?> is in the
-parent directory or in your include_path, and that the language files are in a
-subdirectory of GeSHi's directory called <?php echo colorize(TYPE_NOTICE, "geshi/"); ?>.
-
-Everything else will be done by this script automatically. After the script
-finished you should see messages of what could cause trouble with GeSHi or where
-your language files can be improved. Please be patient, as this might take some time.
-
-
-Checking where to find GeSHi installation ...<?php echo "\t";
-}
-
-// Rudimentary checking of where GeSHi is. In a default install it will be in ../, but
-// it could be in the current directory if the include_path is set. There's nowhere else
-// we can reasonably guess.
-if (is_readable('../geshi.php')) {
-    $path = '../';
-} elseif (is_readable('geshi.php')) {
-    $path = './';
-} else {
-    report_error(TYPE_ERROR, 'Could not find geshi.php - make sure it is in your include path!');
-}
-
-if(!$error_abort) {
-    require $path . 'geshi.php';
-
-    if(!class_exists('GeSHi')) {
-        report_error(TYPE_ERROR, 'The GeSHi class was not found, although it seemed we loaded the correct file!');
-    }
-}
-
-if(!$error_abort) {
-    if(!defined('GESHI_LANG_ROOT')) {
-        report_error(TYPE_ERROR, 'There\'s no information present on where to find the language files!');
-    } elseif(!is_dir(GESHI_LANG_ROOT)) {
-        report_error(TYPE_ERROR, 'The path "'.GESHI_LANG_ROOT.'" given, does not ressemble a directory!');
-    } elseif(!is_readable(GESHI_LANG_ROOT)) {
-        report_error(TYPE_ERROR, 'The path "'.GESHI_LANG_ROOT.'" is not readable to this script!');
-    }
-}
-
-output_error_cache();
-
-if(!$error_abort) {
-    if ( PHP_SAPI == 'cli' ) {
-        echo "Listing available language files ...\t\t";
-    } else {
-        echo "</li>\n<li>Listing available language files ... ";
-    }
-
-    if (!($dir = @opendir(GESHI_LANG_ROOT))) {
-        report_error(TYPE_ERROR, 'Error requesting listing for available language files!');
-    }
-
-    $languages = array();
-
-    if(!$error_abort) {
-        while ($file = readdir($dir)) {
-            if (!$file || $file[0] == '.' || strpos($file, '.php') === false) {
-                continue;
-            }
-            $lang = substr($file, 0,  strpos($file, '.'));
-            if(4 != strlen($file) - strlen($lang)) {
-                continue;
-            }
-            $languages[] = $lang;
-        }
-        closedir($dir);
-    }
-
-    $languages = array_unique($languages);
-    sort($languages);
-
-    if(!count($languages)) {
-        report_error(TYPE_WARNING, 'Unable to locate any usable language files in "'.GESHI_LANG_ROOT.'"!');
-    }
-
-    output_error_cache();
-}
-
-if ( PHP_SAPI == 'cli' ) {
-    if (isset($_SERVER['argv'][1]) && in_array($_SERVER['argv'][1], $languages)) {
-        $languages = array($_SERVER['argv'][1]);
-    }
-} else {
-    if (isset($_REQUEST['show']) && in_array($_REQUEST['show'], $languages)) {
-        $languages = array($_REQUEST['show']);
-    }
-}
-
-if(!$error_abort) {
-    foreach ($languages as $lang) {
-
-        if ( PHP_SAPI == 'cli' ) {
-            echo "Validating language file for '$lang' ...\t\t";
-        } else {
-            echo "</li>\n<li>Validating language file for '$lang' ... ";
-        }
-
-        $langfile = GESHI_LANG_ROOT . $lang . '.php';
-
-        $language_data = array();
-
-        if(!is_file($langfile)) {
-            report_error(TYPE_ERROR, 'The path "' .$langfile. '" does not ressemble a regular file!');
-        } elseif(!is_readable($langfile)) {
-            report_error(TYPE_ERROR, 'Cannot read file "' .$langfile. '"!');
-        } else {
-            $langfile_content = file_get_contents($langfile);
-            if(preg_match("/\?>(?:\r?\n|\r(?!\n)){2,}\Z/", $langfile_content)) {
-                report_error(TYPE_ERROR, 'Language file contains trailing empty lines at EOF!');
-            }
-            if(preg_match("/\?>(?:\r?\n|\r(?!\n))?\Z/", $langfile_content)) {
-                report_error(TYPE_ERROR, 'Language file contains an PHP end marker at EOF!');
-            }
-            if(!preg_match("/(?:\r?\n|\r(?!\n))\Z/", $langfile_content)) {
-                report_error(TYPE_ERROR, 'Language file contains no newline at EOF!');
-            }
-            if(preg_match("/(\r?\n|\r(?!\n))\\1\Z/", $langfile_content)) {
-                report_error(TYPE_ERROR, 'Language file contains trailing empty line before EOF!');
-            }
-            if(preg_match("/[\x20\t]$/m", $langfile_content)) {
-                report_error(TYPE_ERROR, 'Language file contains trailing whitespace at EOL!');
-            }
-            if(preg_match("/\t/", $langfile_content)) {
-                report_error(TYPE_NOTICE, 'Language file contains unescaped tabulator chars (probably for indentation)!');
-            }
-            if(preg_match('/^(?:    )*(?!    )(?! \*) /m', $langfile_content)) {
-                report_error(TYPE_NOTICE, 'Language file contains irregular indentation (other than 4 spaces per indentation level)!');
-            }
-
-            if(!preg_match("/\/\*\*((?!\*\/).)*?Author:((?!\*\/).)*?\*\//s", $langfile_content)) {
-                report_error(TYPE_WARNING, 'Language file does not contain a specification of an author!');
-            }
-            if(!preg_match("/\/\*\*((?!\*\/).)*?Copyright:((?!\*\/).)*?\*\//s", $langfile_content)) {
-                report_error(TYPE_WARNING, 'Language file does not contain a specification of the copyright!');
-            }
-            if(!preg_match("/\/\*\*((?!\*\/).)*?Release Version:((?!\*\/).)*?\*\//s", $langfile_content)) {
-                report_error(TYPE_WARNING, 'Language file does not contain a specification of the release version!');
-            }
-            if(!preg_match("/\/\*\*((?!\*\/).)*?Date Started:((?!\*\/).)*?\*\//s", $langfile_content)) {
-                report_error(TYPE_WARNING, 'Language file does not contain a specification of the date it was started!');
-            }
-            if(!preg_match("/\/\*\*((?!\*\/).)*?This file is part of GeSHi\.((?!\*\/).)*?\*\//s", $langfile_content)) {
-                report_error(TYPE_WARNING, 'Language file does not state that it belongs to GeSHi!');
-            }
-            if(!preg_match("/\/\*\*((?!\*\/).)*?language file for GeSHi\.((?!\*\/).)*?\*\//s", $langfile_content)) {
-                report_error(TYPE_WARNING, 'Language file does not state that it is a language file for GeSHi!');
-            }
-            if(!preg_match("/\/\*\*((?!\*\/).)*?GNU General Public License((?!\*\/).)*?\*\//s", $langfile_content)) {
-                report_error(TYPE_WARNING, 'Language file does not state that it is provided under the terms of the GNU GPL!');
-            }
-
-            unset($langfile_content);
-
-            include $langfile;
-
-            if(!isset($language_data)) {
-                report_error(TYPE_ERROR, 'Language file does not contain a $language_data structure to check!');
-            } elseif (!is_array($language_data)) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data structure which is not an array!');
-            }
-        }
-
-        if(!$error_abort) {
-            if(!isset($language_data['LANG_NAME'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'LANG_NAME\'] specification!');
-            } elseif (!is_string($language_data['LANG_NAME'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'LANG_NAME\'] specification which is not a string!');
-            }
-
-            if(!isset($language_data['COMMENT_SINGLE'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'COMMENT_SIGNLE\'] structure to check!');
-            } elseif (!is_array($language_data['COMMENT_SINGLE'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'COMMENT_SINGLE\'] structure which is not an array!');
-            }
-
-            if(!isset($language_data['COMMENT_MULTI'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'COMMENT_MULTI\'] structure to check!');
-            } elseif (!is_array($language_data['COMMENT_MULTI'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'COMMENT_MULTI\'] structure which is not an array!');
-            }
-
-            if(isset($language_data['COMMENT_REGEXP'])) {
-                if (!is_array($language_data['COMMENT_REGEXP'])) {
-                    report_error(TYPE_ERROR, 'Language file contains a $language_data[\'COMMENT_REGEXP\'] structure which is not an array!');
-                }
-            }
-
-            if(!isset($language_data['QUOTEMARKS'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'QUOTEMARKS\'] structure to check!');
-            } elseif (!is_array($language_data['QUOTEMARKS'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'QUOTEMARKS\'] structure which is not an array!');
-            }
-
-            if(isset($language_data['HARDQUOTE'])) {
-                if (!is_array($language_data['HARDQUOTE'])) {
-                    report_error(TYPE_ERROR, 'Language file contains a $language_data[\'HARDQUOTE\'] structure which is not an array!');
-                }
-            }
-
-            if(!isset($language_data['ESCAPE_CHAR'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'ESCAPE_CHAR\'] specification to check!');
-            } elseif (!is_string($language_data['ESCAPE_CHAR'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'ESCAPE_CHAR\'] specification which is not a string!');
-            } elseif (1 < strlen($language_data['ESCAPE_CHAR'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'ESCAPE_CHAR\'] specification is not empty or exactly one char!');
-            }
-
-            if(!isset($language_data['CASE_KEYWORDS'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'CASE_KEYWORDS\'] specification!');
-            } elseif (!is_int($language_data['CASE_KEYWORDS'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'CASE_KEYWORDS\'] specification which is not an integer!');
-            } elseif (GESHI_CAPS_NO_CHANGE != $language_data['CASE_KEYWORDS'] &&
-                GESHI_CAPS_LOWER != $language_data['CASE_KEYWORDS'] &&
-                GESHI_CAPS_UPPER != $language_data['CASE_KEYWORDS']) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'CASE_KEYWORDS\'] specification which is neither of GESHI_CAPS_NO_CHANGE, GESHI_CAPS_LOWER nor GESHI_CAPS_UPPER!');
-            }
-
-            if(!isset($language_data['KEYWORDS'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'KEYWORDS\'] structure to check!');
-            } elseif (!is_array($language_data['KEYWORDS'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'KEYWORDS\'] structure which is not an array!');
-            } else {
-                foreach($language_data['KEYWORDS'] as $kw_key => $kw_value) {
-                    if(!is_integer($kw_key)) {
-                        report_error(TYPE_WARNING, "Language file contains an key '$kw_key' in \$language_data['KEYWORDS'] that is not integer!");
-                    } elseif (!is_array($kw_value)) {
-                        report_error(TYPE_ERROR, "Language file contains a \$language_data['KEYWORDS']['$kw_value'] structure which is not an array!");
-                    }
-                }
-            }
-
-            if(!isset($language_data['SYMBOLS'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'SYMBOLS\'] structure to check!');
-            } elseif (!is_array($language_data['SYMBOLS'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'SYMBOLS\'] structure which is not an array!');
-            }
-
-            if(!isset($language_data['CASE_SENSITIVE'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'CASE_SENSITIVE\'] structure to check!');
-            } elseif (!is_array($language_data['CASE_SENSITIVE'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'CASE_SENSITIVE\'] structure which is not an array!');
-            } else {
-                foreach($language_data['CASE_SENSITIVE'] as $cs_key => $cs_value) {
-                    if(!is_integer($cs_key)) {
-                        report_error(TYPE_WARNING, "Language file contains an key '$cs_key' in \$language_data['CASE_SENSITIVE'] that is not integer!");
-                    } elseif (!is_bool($cs_value)) {
-                        report_error(TYPE_ERROR, "Language file contains a Case Sensitivity specification for \$language_data['CASE_SENSITIVE']['$cs_value'] which is not a boolean!");
-                    }
-                }
-            }
-
-            if(!isset($language_data['URLS'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'URLS\'] structure to check!');
-            } elseif (!is_array($language_data['URLS'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'URLS\'] structure which is not an array!');
-            } else {
-                foreach($language_data['URLS'] as $url_key => $url_value) {
-                    if(!is_integer($url_key)) {
-                        report_error(TYPE_WARNING, "Language file contains an key '$url_key' in \$language_data['URLS'] that is not integer!");
-                    } elseif (!is_string($url_value)) {
-                        report_error(TYPE_ERROR, "Language file contains a Documentation URL specification for \$language_data['URLS']['$url_value'] which is not a string!");
-                    } elseif (preg_match('#&([^;]*(=|$))#U', $url_value)) {
-                        report_error(TYPE_ERROR, "Language file contains unescaped ampersands (&amp;) in \$language_data['URLS']!");
-                    }
-                }
-            }
-
-            if(!isset($language_data['OOLANG'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'OOLANG\'] specification!');
-            } elseif (!is_int($language_data['OOLANG']) && !is_bool($language_data['OOLANG'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'OOLANG\'] specification which is neither boolean nor integer!');
-            } elseif (false !== $language_data['OOLANG'] &&
-                true !== $language_data['OOLANG'] &&
-                2 !== $language_data['OOLANG']) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'OOLANG\'] specification which is neither of false, true or 2!');
-            }
-
-            if(!isset($language_data['OBJECT_SPLITTERS'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'OBJECT_SPLITTERS\'] structure to check!');
-            } elseif (!is_array($language_data['OBJECT_SPLITTERS'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'OBJECT_SPLITTERS\'] structure which is not an array!');
-            }
-
-            if(!isset($language_data['REGEXPS'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'REGEXPS\'] structure to check!');
-            } elseif (!is_array($language_data['REGEXPS'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'REGEXPS\'] structure which is not an array!');
-            }
-
-            if(!isset($language_data['STRICT_MODE_APPLIES'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'STRICT_MODE_APPLIES\'] specification!');
-            } elseif (!is_int($language_data['STRICT_MODE_APPLIES'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'STRICT_MODE_APPLIES\'] specification which is not an integer!');
-            } elseif (GESHI_MAYBE != $language_data['STRICT_MODE_APPLIES'] &&
-                GESHI_ALWAYS != $language_data['STRICT_MODE_APPLIES'] &&
-                GESHI_NEVER != $language_data['STRICT_MODE_APPLIES']) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'STRICT_MODE_APPLIES\'] specification which is neither of GESHI_MAYBE, GESHI_ALWAYS nor GESHI_NEVER!');
-            }
-
-            if(!isset($language_data['SCRIPT_DELIMITERS'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'SCRIPT_DELIMITERS\'] structure to check!');
-            } elseif (!is_array($language_data['SCRIPT_DELIMITERS'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'SCRIPT_DELIMITERS\'] structure which is not an array!');
-            }
-
-            if(!isset($language_data['HIGHLIGHT_STRICT_BLOCK'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'HIGHLIGHT_STRICT_BLOCK\'] structure to check!');
-            } elseif (!is_array($language_data['HIGHLIGHT_STRICT_BLOCK'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'HIGHLIGHT_STRICT_BLOCK\'] structure which is not an array!');
-            }
-
-            if(isset($language_data['TAB_WIDTH'])) {
-                if (!is_int($language_data['TAB_WIDTH'])) {
-                    report_error(TYPE_ERROR, 'Language file contains a $language_data[\'TAB_WIDTH\'] specification which is not an integer!');
-                } elseif (1 > $language_data['TAB_WIDTH']) {
-                    report_error(TYPE_ERROR, 'Language file contains a $language_data[\'TAB_WIDTH\'] specification which is less than 1!');
-                }
-            }
-
-            if(isset($language_data['PARSER_CONTROL'])) {
-                if (!is_array($language_data['PARSER_CONTROL'])) {
-                    report_error(TYPE_ERROR, 'Language file contains a $language_data[\'PARSER_CONTROL\'] structure which is not an array!');
-                }
-            }
-
-            if(!isset($language_data['STYLES'])) {
-                report_error(TYPE_ERROR, 'Language file contains no $language_data[\'STYLES\'] structure to check!');
-            } elseif (!is_array($language_data['STYLES'])) {
-                report_error(TYPE_ERROR, 'Language file contains a $language_data[\'STYLES\'] structure which is not an array!');
-            } else {
-                $style_arrays = array('KEYWORDS', 'COMMENTS', 'ESCAPE_CHAR',
-                    'BRACKETS', 'STRINGS', 'NUMBERS', 'METHODS', 'SYMBOLS',
-                    'REGEXPS', 'SCRIPT');
-                foreach($style_arrays as $style_kind) {
-                    if(!isset($language_data['STYLES'][$style_kind])) {
-                        report_error(TYPE_ERROR, "Language file contains no \$language_data['STYLES']['$style_kind'] structure to check!");
-                    } elseif (!is_array($language_data['STYLES'][$style_kind])) {
-                        report_error(TYPE_ERROR, "Language file contains a \$language_data['STYLES\']['$style_kind'] structure which is not an array!");
-                    } else {
-                        foreach($language_data['STYLES'][$style_kind] as $sk_key => $sk_value) {
-                            if(!is_int($sk_key) && ('COMMENTS' != $style_kind && 'MULTI' != $sk_key)
-                                && !(('STRINGS' == $style_kind || 'ESCAPE_CHAR' == $style_kind) && 'HARD' == $sk_key)) {
-                                report_error(TYPE_WARNING, "Language file contains an key '$sk_key' in \$language_data['STYLES']['$style_kind'] that is not integer!");
-                            } elseif (!is_string($sk_value)) {
-                                report_error(TYPE_WARNING, "Language file contains a CSS specification for \$language_data['STYLES']['$style_kind'][$key] which is not a string!");
-                            }
-                        }
-                    }
-                }
-
-                unset($style_arrays);
-            }
-        }
-
-        if(!$error_abort) {
-            //Initial sanity checks survived? --> Let's dig deeper!
-            foreach($language_data['KEYWORDS'] as $key => $keywords) {
-                if(!isset($language_data['CASE_SENSITIVE'][$key])) {
-                    report_error(TYPE_ERROR, "Language file contains no \$language_data['CASE_SENSITIVE'] specification for keyword group $key!");
-                }
-                if(!isset($language_data['URLS'][$key])) {
-                    report_error(TYPE_ERROR, "Language file contains no \$language_data['URLS'] specification for keyword group $key!");
-                }
-                if(empty($keywords)) {
-                    report_error(TYPE_WARNING, "Language file contains an empty keyword list in \$language_data['KEYWORDS'] for group $key!");
-                }
-                foreach($keywords as $id => $kw) {
-                    if(!is_string($kw)) {
-                        report_error(TYPE_WARNING, "Language file contains an non-string entry at \$language_data['KEYWORDS'][$key][$id]!");
-                    } elseif (!strlen($kw)) {
-                        report_error(TYPE_ERROR, "Language file contains an empty string entry at \$language_data['KEYWORDS'][$key][$id]!");
-                    } elseif (preg_match('/^([\(\)\{\}\[\]\^=.,:;\-+\*\/%\$\"\'\?]|&[\w#]\w*;)+$/i', $kw)) {
-                        report_error(TYPE_NOTICE, "Language file contains an keyword ('$kw') at \$language_data['KEYWORDS'][$key][$id] which seems to be better suited for the symbols section!");
-                    }
-                }
-                if(isset($language_data['CASE_SENSITIVE'][$key]) && !$language_data['CASE_SENSITIVE'][$key]) {
-                    array_walk($keywords, 'dupfind_strtolower');
-                }
-                if(count($keywords) != count(array_unique($keywords))) {
-                    $kw_diffs = array_count_values($keywords);
-                    foreach($kw_diffs as $kw => $kw_count) {
-                        if($kw_count > 1) {
-                            report_error(TYPE_WARNING, "Language file contains per-group duplicate keyword '$kw' in \$language_data['KEYWORDS'][$key]!");
-                        }
-                    }
-                }
-            }
-
-            $disallowed_before = "(?<![a-zA-Z0-9\$_\|\#;>|^&";
-            $disallowed_after = "(?![a-zA-Z0-9_\|%\\-&;";
-
-            foreach($language_data['KEYWORDS'] as $key => $keywords) {
-                foreach($language_data['KEYWORDS'] as $key2 => $keywords2) {
-                    if($key2 <= $key) {
-                        continue;
-                    }
-                    $kw_diffs = array_intersect($keywords, $keywords2);
-                    foreach($kw_diffs as $kw) {
-                        if(isset($language_data['PARSER_CONTROL']['KEYWORDS'])) {
-                            //Check the precondition\post-cindition for the involved keyword groups
-                            $g1_pre = $disallowed_before;
-                            $g2_pre = $disallowed_before;
-                            $g1_post = $disallowed_after;
-                            $g2_post = $disallowed_after;
-                            if(isset($language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'])) {
-                                $g1_pre = $language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'];
-                                $g2_pre = $language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'];
-                            }
-                            if(isset($language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'])) {
-                                $g1_post = $language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'];
-                                $g2_post = $language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'];
-                            }
-
-                            if(isset($language_data['PARSER_CONTROL']['KEYWORDS'][$key]['DISALLOWED_BEFORE'])) {
-                                $g1_pre = $language_data['PARSER_CONTROL']['KEYWORDS'][$key]['DISALLOWED_BEFORE'];
-                            }
-                            if(isset($language_data['PARSER_CONTROL']['KEYWORDS'][$key]['DISALLOWED_AFTER'])) {
-                                $g1_post = $language_data['PARSER_CONTROL']['KEYWORDS'][$key]['DISALLOWED_AFTER'];
-                            }
-
-                            if(isset($language_data['PARSER_CONTROL']['KEYWORDS'][$key2]['DISALLOWED_BEFORE'])) {
-                                $g2_pre = $language_data['PARSER_CONTROL']['KEYWORDS'][$key2]['DISALLOWED_BEFORE'];
-                            }
-                            if(isset($language_data['PARSER_CONTROL']['KEYWORDS'][$key2]['DISALLOWED_AFTER'])) {
-                                $g2_post = $language_data['PARSER_CONTROL']['KEYWORDS'][$key2]['DISALLOWED_AFTER'];
-                            }
-
-                            if($g1_pre != $g2_pre || $g1_post != $g2_post) {
-                                continue;
-                            }
-                        }
-                        report_error(TYPE_WARNING, "Language file contains cross-group duplicate keyword '$kw' in \$language_data['KEYWORDS'][$key] and \$language_data['KEYWORDS'][$key2]!");
-                    }
-                }
-            }
-            foreach($language_data['CASE_SENSITIVE'] as $key => $keywords) {
-                if(!isset($language_data['KEYWORDS'][$key]) && $key != GESHI_COMMENTS) {
-                    report_error(TYPE_WARNING, "Language file contains an superfluous \$language_data['CASE_SENSITIVE'] specification for non-existing keyword group $key!");
-                }
-            }
-            foreach($language_data['URLS'] as $key => $keywords) {
-                if(!isset($language_data['KEYWORDS'][$key])) {
-                    report_error(TYPE_WARNING, "Language file contains an superfluous \$language_data['URLS'] specification for non-existing keyword group $key!");
-                }
-            }
-            foreach($language_data['STYLES']['KEYWORDS'] as $key => $keywords) {
-                if(!isset($language_data['KEYWORDS'][$key])) {
-                    report_error(TYPE_WARNING, "Language file contains an superfluous \$language_data['STYLES']['KEYWORDS'] specification for non-existing keyword group $key!");
-                }
-            }
-
-            foreach($language_data['COMMENT_SINGLE'] as $ck => $cv) {
-                if(!is_int($ck)) {
-                    report_error(TYPE_WARNING, "Language file contains an key '$ck' in \$language_data['COMMENT_SINGLE'] that is not integer!");
-                }
-                if(!is_string($cv)) {
-                    report_error(TYPE_WARNING, "Language file contains an non-string entry at \$language_data['COMMENT_SINGLE'][$ck]!");
-                }
-                if(!isset($language_data['STYLES']['COMMENTS'][$ck])) {
-                    report_error(TYPE_WARNING, "Language file contains no \$language_data['STYLES']['COMMENTS'] specification for comment group $ck!");
-                }
-            }
-            if(isset($language_data['COMMENT_REGEXP'])) {
-                foreach($language_data['COMMENT_REGEXP'] as $ck => $cv) {
-                    if(!is_int($ck)) {
-                        report_error(TYPE_WARNING, "Language file contains an key '$ck' in \$language_data['COMMENT_REGEXP'] that is not integer!");
-                    }
-                    if(!is_string($cv)) {
-                        report_error(TYPE_WARNING, "Language file contains an non-string entry at \$language_data['COMMENT_REGEXP'][$ck]!");
-                    }
-                    if(!isset($language_data['STYLES']['COMMENTS'][$ck])) {
-                        report_error(TYPE_WARNING, "Language file contains no \$language_data['STYLES']['COMMENTS'] specification for comment group $ck!");
-                    }
-                }
-            }
-            foreach($language_data['STYLES']['COMMENTS'] as $ck => $cv) {
-                if($ck != 'MULTI' && !isset($language_data['COMMENT_SINGLE'][$ck]) &&
-                    !isset($language_data['COMMENT_REGEXP'][$ck])) {
-                    report_error(TYPE_NOTICE, "Language file contains an superfluous \$language_data['STYLES']['COMMENTS'] specification for Single Line or Regular-Expression Comment key $ck!");
-                }
-            }
-            if (isset($language_data['STYLES']['STRINGS']['HARD'])) {
-                if (empty($language_data['HARDQUOTE'])) {
-                    report_error(TYPE_NOTICE, "Language file contains superfluous \$language_data['STYLES']['STRINGS'] specification for key 'HARD', but no 'HARDQUOTE's are defined!");
-                }
-                unset($language_data['STYLES']['STRINGS']['HARD']);
-            }
-            foreach($language_data['STYLES']['STRINGS'] as $sk => $sv) {
-                if($sk && !isset($language_data['QUOTEMARKS'][$sk])) {
-                    report_error(TYPE_NOTICE, "Language file contains an superfluous \$language_data['STYLES']['STRINGS'] specification for non-existing quotemark key $sk!");
-                }
-            }
-
-            foreach($language_data['REGEXPS'] as $rk => $rv) {
-                if(!is_int($rk)) {
-                    report_error(TYPE_WARNING, "Language file contains an key '$rk' in \$language_data['REGEXPS'] that is not integer!");
-                }
-                if(is_string($rv)) {
-                    //Check for unmasked / in regular expressions ...
-                    if(empty($rv)) {
-                        report_error(TYPE_WARNING, "Language file contains an empty regular expression at \$language_data['REGEXPS'][$rk]!");
-                    } else {
-                        if(preg_match("/(?<!\\\\)\//s", $rv)) {
-                            report_error(TYPE_WARNING, "Language file contains a regular expression with an unmasked / character at \$language_data['REGEXPS'][$rk]!");
-                        } elseif (preg_match("/(?<!<)(\\\\\\\\)*\\\\\|(?!>)/s", $rv)) {
-                            report_error(TYPE_WARNING, "Language file contains a regular expression with an unescaped match for a pipe character '|' which needs escaping as '&lt;PIPE&gt;' instead at \$language_data['REGEXPS'][$rk]!");
-                        }
-                    }
-                } elseif(is_array($rv)) {
-                    if(!isset($rv[GESHI_SEARCH])) {
-                        report_error(TYPE_ERROR, "Language file contains no GESHI_SEARCH entry in extended regular expression at \$language_data['REGEXPS'][$rk]!");
-                    } elseif(!is_string($rv[GESHI_SEARCH])) {
-                        report_error(TYPE_ERROR, "Language file contains a GESHI_SEARCH entry in extended regular expression at \$language_data['REGEXPS'][$rk] which is not a string!");
-                    } else {
-                        if(preg_match("/(?<!\\\\)\//s", $rv[GESHI_SEARCH])) {
-                            report_error(TYPE_WARNING, "Language file contains a regular expression with an unmasked / character at \$language_data['REGEXPS'][$rk]!");
-                        } elseif (preg_match("/(?<!<)(\\\\\\\\)*\\\\\|(?!>)/s", $rv[GESHI_SEARCH])) {
-                            report_error(TYPE_WARNING, "Language file contains a regular expression with an unescaped match for a pipe character '|' which needs escaping as '&lt;PIPE&gt;' instead at \$language_data['REGEXPS'][$rk]!");
-                        }
-                    }
-                    if(!isset($rv[GESHI_REPLACE])) {
-                        report_error(TYPE_WARNING, "Language file contains no GESHI_REPLACE entry in extended regular expression at \$language_data['REGEXPS'][$rk]!");
-                    } elseif(!is_string($rv[GESHI_REPLACE])) {
-                        report_error(TYPE_ERROR, "Language file contains a GESHI_REPLACE entry in extended regular expression at \$language_data['REGEXPS'][$rk] which is not a string!");
-                    }
-                    if(!isset($rv[GESHI_MODIFIERS])) {
-                        report_error(TYPE_WARNING, "Language file contains no GESHI_MODIFIERS entry in extended regular expression at \$language_data['REGEXPS'][$rk]!");
-                    } elseif(!is_string($rv[GESHI_MODIFIERS])) {
-                        report_error(TYPE_ERROR, "Language file contains a GESHI_MODIFIERS entry in extended regular expression at \$language_data['REGEXPS'][$rk] which is not a string!");
-                    }
-                    if(!isset($rv[GESHI_BEFORE])) {
-                        report_error(TYPE_WARNING, "Language file contains no GESHI_BEFORE entry in extended regular expression at \$language_data['REGEXPS'][$rk]!");
-                    } elseif(!is_string($rv[GESHI_BEFORE])) {
-                        report_error(TYPE_ERROR, "Language file contains a GESHI_BEFORE entry in extended regular expression at \$language_data['REGEXPS'][$rk] which is not a string!");
-                    }
-                    if(!isset($rv[GESHI_AFTER])) {
-                        report_error(TYPE_WARNING, "Language file contains no GESHI_AFTER entry in extended regular expression at \$language_data['REGEXPS'][$rk]!");
-                    } elseif(!is_string($rv[GESHI_AFTER])) {
-                        report_error(TYPE_ERROR, "Language file contains a GESHI_AFTER entry in extended regular expression at \$language_data['REGEXPS'][$rk] which is not a string!");
-                    }
-                } else {
-                    report_error(TYPE_WARNING, "Language file contains an non-string and non-array entry at \$language_data['REGEXPS'][$rk]!");
-                }
-                if(!isset($language_data['STYLES']['REGEXPS'][$rk])) {
-                    report_error(TYPE_WARNING, "Language file contains no \$language_data['STYLES']['REGEXPS'] specification for regexp group $rk!");
-                }
-            }
-            foreach($language_data['STYLES']['REGEXPS'] as $rk => $rv) {
-                if(!isset($language_data['REGEXPS'][$rk])) {
-                    report_error(TYPE_NOTICE, "Language file contains an superfluous \$language_data['STYLES']['REGEXPS'] specification for regexp key $rk!");
-                }
-            }
-
-
-        }
-
-        output_error_cache();
-
-        flush();
-
-        if($error_abort) {
-            break;
-        }
-    }
-}
-
-$time_end = explode(' ', microtime());
-$time_diff = $time_end[0] + $time_end[1] - $time_start[0] - $time_start[1];
-
-if ( PHP_SAPI != 'cli' ) {
-?></li>
-</ol>
-
-<p>Validation process completed in <?php printf("%.2f", $time_diff); ?> seconds.</p>
-
-<div id="footer">GeSHi &copy; 2004-2007 Nigel McNie, 2007-2008 Benny Baumann, released under the GNU GPL</div>
-</body>
-</html>
-
-<?php } else { ?>
-
-Validation process completed in <?php printf("%.2f", $time_diff); ?> seconds.
-
-GeSHi &copy; 2004-2007 Nigel McNie, 2007-2014 Benny Baumann, released under the GNU GPL
-
-<?php } ?>
diff --git a/htdocs/application/libraries/geshi/contrib/langwiz.php b/htdocs/application/libraries/geshi/contrib/langwiz.php
index 3338fa6..dae806a 100644
--- a/htdocs/application/libraries/geshi/contrib/langwiz.php
+++ b/htdocs/application/libraries/geshi/contrib/langwiz.php
@@ -173,17 +173,20 @@ features are made available through this script.</p>
 // Rudimentary checking of where GeSHi is. In a default install it will be in ../, but
 // it could be in the current directory if the include_path is set. There's nowhere else
 // we can reasonably guess.
-if (is_readable('../geshi.php')) {
-    $path = '../';
-} elseif (is_readable('geshi.php')) {
-    $path = './';
+if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    //composer install
+    require __DIR__ . '/../vendor/autoload.php';
+} else if (file_exists(__DIR__ . '/../src/geshi.php')) {
+    //git checkout
+    require __DIR__ . '/../src/geshi.php';
+} else if (stream_resolve_include_path('geshi.php')) {
+    // Assume you've put geshi in the include_path already
+    require_once 'geshi.php';
 } else {
     report_error(TYPE_ERROR, 'Could not find geshi.php - make sure it is in your include path!');
 }
 
 if(!$error_abort) {
-    require $path . 'geshi.php';
-
     if(!class_exists('GeSHi')) {
         report_error(TYPE_ERROR, 'The GeSHi class was not found, although it seemed we loaded the correct file!');
     }
@@ -347,7 +350,7 @@ for($i = 1; $i <= count($kw_cases_sel); $i += 1) {
 }
 
 $lang = validate_lang();
-var_dump($lang);
+//var_dump($lang);
 echo "</pre>";
 
 ?>
diff --git a/htdocs/application/libraries/geshi/geshi.php b/htdocs/application/libraries/geshi/geshi.php
index 0cc4f29..4effa48 100644
--- a/htdocs/application/libraries/geshi/geshi.php
+++ b/htdocs/application/libraries/geshi/geshi.php
@@ -30,7 +30,6 @@
  * @author     Nigel McNie <nigel@geshi.org>, Benny Baumann <BenBE@omorphia.de>
  * @copyright  (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2014 Benny Baumann
  * @license    http://gnu.org/copyleft/gpl.html GNU GPL
- *
  */
 
 //
@@ -41,7 +40,7 @@
 //
 
 /** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.8.12');
+define('GESHI_VERSION', '1.0.9.0');
 
 // Define the root directory for the GeSHi code tree
 if (!defined('GESHI_ROOT')) {
@@ -149,39 +148,6 @@ define('GESHI_CLASS', 5);
 /** Used in language files to mark comments */
 define('GESHI_COMMENTS', 0);
 
-/** Used to work around missing PHP features **/
-define('GESHI_PHP_PRE_433', !(version_compare(PHP_VERSION, '4.3.3') === 1));
-
-/** make sure we can call stripos **/
-if (!function_exists('stripos')) {
-    // the offset param of preg_match is not supported below PHP 4.3.3
-    if (GESHI_PHP_PRE_433) {
-        /**
-         * @ignore
-         */
-        function stripos($haystack, $needle, $offset = null) {
-            if (!is_null($offset)) {
-                $haystack = substr($haystack, $offset);
-            }
-            if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE)) {
-                return $match[0][1];
-            }
-            return false;
-        }
-    }
-    else {
-        /**
-         * @ignore
-         */
-        function stripos($haystack, $needle, $offset = null) {
-            if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE, $offset)) {
-                return $match[0][1];
-            }
-            return false;
-        }
-    }
-}
-
 /** some old PHP / PCRE subpatterns only support up to xxx subpatterns in
     regular expressions. Set this to false if your PCRE lib is up to date
     @see GeSHi->optimize_regexp_list()
@@ -253,49 +219,48 @@ define('GESHI_ERROR_INVALID_LINE_NUMBER_TYPE', 5);
  * about how to use this class.
  *
  * @package   geshi
- * @author    Nigel McNie <nigel@geshi.org>, Benny Baumann <BenBE@omorphia.de>
+ * @author    Nigel McNie <nigel@geshi.org>
+ * @author    Benny Baumann <BenBE@omorphia.de>
  * @copyright (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2014 Benny Baumann
  */
 class GeSHi {
-    /**#@+
-     * @access private
-     */
+
     /**
      * The source code to highlight
      * @var string
      */
-    var $source = '';
+    protected $source = '';
 
     /**
      * The language to use when highlighting
      * @var string
      */
-    var $language = '';
+    protected $language = '';
 
     /**
      * The data for the language used
      * @var array
      */
-    var $language_data = array();
+    protected $language_data = array();
 
     /**
      * The path to the language files
      * @var string
      */
-    var $language_path = GESHI_LANG_ROOT;
+    protected $language_path = GESHI_LANG_ROOT;
 
     /**
      * The error message associated with an error
      * @var string
      * @todo check err reporting works
      */
-    var $error = false;
+    protected $error = false;
 
     /**
      * Possible error messages
      * @var array
      */
-    var $error_messages = array(
+    protected $error_messages = array(
         GESHI_ERROR_NO_SUCH_LANG => 'GeSHi could not find the language {LANGUAGE} (using path {PATH})',
         GESHI_ERROR_FILE_NOT_READABLE => 'The file specified for load_from_file was not readable',
         GESHI_ERROR_INVALID_HEADER_TYPE => 'The header type specified is invalid',
@@ -306,13 +271,13 @@ class GeSHi {
      * Whether highlighting is strict or not
      * @var boolean
      */
-    var $strict_mode = false;
+    protected $strict_mode = false;
 
     /**
      * Whether to use CSS classes in output
      * @var boolean
      */
-    var $use_classes = false;
+    protected $use_classes = false;
 
     /**
      * The type of header to use. Can be one of the following
@@ -324,13 +289,13 @@ class GeSHi {
      *
      * @var int
      */
-    var $header_type = GESHI_HEADER_PRE;
+    protected $header_type = GESHI_HEADER_PRE;
 
     /**
      * Array of permissions for which lexics should be highlighted
      * @var array
      */
-    var $lexic_permissions = array(
+    protected $lexic_permissions = array(
         'KEYWORDS' =>    array(),
         'COMMENTS' =>    array('MULTI' => true),
         'REGEXPS' =>     array(),
@@ -347,44 +312,44 @@ class GeSHi {
      * The time it took to parse the code
      * @var double
      */
-    var $time = 0;
+    protected $time = 0;
 
     /**
      * The content of the header block
      * @var string
      */
-    var $header_content = '';
+    protected $header_content = '';
 
     /**
      * The content of the footer block
      * @var string
      */
-    var $footer_content = '';
+    protected $footer_content = '';
 
     /**
      * The style of the header block
      * @var string
      */
-    var $header_content_style = '';
+    protected $header_content_style = '';
 
     /**
      * The style of the footer block
      * @var string
      */
-    var $footer_content_style = '';
+    protected $footer_content_style = '';
 
     /**
      * Tells if a block around the highlighted source should be forced
      * if not using line numbering
      * @var boolean
      */
-    var $force_code_block = false;
+    protected $force_code_block = false;
 
     /**
      * The styles for hyperlinks in the code
      * @var array
      */
-    var $link_styles = array();
+    protected $link_styles = array();
 
     /**
      * Whether important blocks should be recognised or not
@@ -392,7 +357,7 @@ class GeSHi {
      * @deprecated
      * @todo REMOVE THIS FUNCTIONALITY!
      */
-    var $enable_important_blocks = false;
+    protected $enable_important_blocks = false;
 
     /**
      * Styles for important parts of the code
@@ -401,31 +366,31 @@ class GeSHi {
      * @todo As above - rethink the whole idea of important blocks as it is buggy and
      * will be hard to implement in 1.2
      */
-    var $important_styles = 'font-weight: bold; color: red;'; // Styles for important parts of the code
+    protected $important_styles = 'font-weight: bold; color: red;'; // Styles for important parts of the code
 
     /**
      * Whether CSS IDs should be added to the code
      * @var boolean
      */
-    var $add_ids = false;
+    protected $add_ids = false;
 
     /**
      * Lines that should be highlighted extra
      * @var array
      */
-    var $highlight_extra_lines = array();
+    protected $highlight_extra_lines = array();
 
     /**
      * Styles of lines that should be highlighted extra
      * @var array
      */
-    var $highlight_extra_lines_styles = array();
+    protected $highlight_extra_lines_styles = array();
 
     /**
      * Styles of extra-highlighted lines
      * @var string
      */
-    var $highlight_extra_lines_style = 'background-color: #ffc;';
+    protected $highlight_extra_lines_style = 'background-color: #ffc;';
 
     /**
      * The line ending
@@ -433,120 +398,120 @@ class GeSHi {
      * Otherwise, all instances of \n will be replaced with $line_ending
      * @var string
      */
-    var $line_ending = null;
+    protected $line_ending = null;
 
     /**
      * Number at which line numbers should start at
      * @var int
      */
-    var $line_numbers_start = 1;
+    protected $line_numbers_start = 1;
 
     /**
      * The overall style for this code block
      * @var string
      */
-    var $overall_style = 'font-family:monospace;';
+    protected $overall_style = 'font-family:monospace;';
 
     /**
      *  The style for the actual code
      * @var string
      */
-    var $code_style = 'font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;';
+    protected $code_style = 'font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;';
 
     /**
      * The overall class for this code block
      * @var string
      */
-    var $overall_class = '';
+    protected $overall_class = '';
 
     /**
      * The overall ID for this code block
      * @var string
      */
-    var $overall_id = '';
+    protected $overall_id = '';
 
     /**
      * Line number styles
      * @var string
      */
-    var $line_style1 = 'font-weight: normal; vertical-align:top;';
+    protected $line_style1 = 'font-weight: normal; vertical-align:top;';
 
     /**
      * Line number styles for fancy lines
      * @var string
      */
-    var $line_style2 = 'font-weight: bold; vertical-align:top;';
+    protected $line_style2 = 'font-weight: bold; vertical-align:top;';
 
     /**
      * Style for line numbers when GESHI_HEADER_PRE_TABLE is chosen
      * @var string
      */
-    var $table_linenumber_style = 'width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;';
+    protected $table_linenumber_style = 'width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;';
 
     /**
      * Flag for how line numbers are displayed
      * @var boolean
      */
-    var $line_numbers = GESHI_NO_LINE_NUMBERS;
+    protected $line_numbers = GESHI_NO_LINE_NUMBERS;
 
     /**
      * Flag to decide if multi line spans are allowed. Set it to false to make sure
      * each tag is closed before and reopened after each linefeed.
      * @var boolean
      */
-    var $allow_multiline_span = true;
+    protected $allow_multiline_span = true;
 
     /**
      * The "nth" value for fancy line highlighting
      * @var int
      */
-    var $line_nth_row = 0;
+    protected $line_nth_row = 0;
 
     /**
      * The size of tab stops
      * @var int
      */
-    var $tab_width = 8;
+    protected $tab_width = 8;
 
     /**
      * Should we use language-defined tab stop widths?
      * @var int
      */
-    var $use_language_tab_width = false;
+    protected $use_language_tab_width = false;
 
     /**
      * Default target for keyword links
      * @var string
      */
-    var $link_target = '';
+    protected $link_target = '';
 
     /**
      * The encoding to use for entity encoding
      * NOTE: Used with Escape Char Sequences to fix UTF-8 handling (cf. SF#2037598)
      * @var string
      */
-    var $encoding = 'utf-8';
+    protected $encoding = 'utf-8';
 
     /**
      * Should keywords be linked?
      * @var boolean
      */
-    var $keyword_links = true;
+    protected $keyword_links = true;
 
     /**
      * Currently loaded language file
-     * @var string
+     * @var    string
      * @since 1.0.7.22
      */
-    var $loaded_language = '';
+    protected $loaded_language = '';
 
     /**
      * Wether the caches needed for parsing are built or not
      *
-     * @var bool
+     * @var   bool
      * @since 1.0.8
      */
-    var $parse_cache_built = false;
+    protected $parse_cache_built = false;
 
     /**
      * Work around for Suhosin Patch with disabled /e modifier
@@ -560,32 +525,30 @@ class GeSHi {
      *   use <code>preg_replace_callback()</code> instead
      * </blockquote>
      *
-     * @var array
+     * @var   array
      * @since 1.0.8
      */
-    var $_kw_replace_group = 0;
-    var $_rx_key = 0;
+    protected $_kw_replace_group = 0;
+    protected $_rx_key = 0;
 
     /**
      * some "callback parameters" for handle_multiline_regexps
      *
-     * @since 1.0.8
+     * @since  1.0.8
      * @access private
-     * @var string
+     * @var    string
      */
-    var $_hmr_before = '';
-    var $_hmr_replace = '';
-    var $_hmr_after = '';
-    var $_hmr_key = 0;
-
-    /**#@-*/
+    protected $_hmr_before = '';
+    protected $_hmr_replace = '';
+    protected $_hmr_after = '';
+    protected $_hmr_key = 0;
 
     /**
      * Creates a new GeSHi object, with source and language
      *
-     * @param string The source code to highlight
-     * @param string The language to highlight the source with
-     * @param string The path to the language file directory. <b>This
+     * @param string $source   The source code to highlight
+     * @param string $language The language to highlight the source with
+     * @param string $path     The path to the language file directory. <b>This
      *               is deprecated!</b> I've backported the auto path
      *               detection from the 1.1.X dev branch, so now it
      *               should be automatically set correctly. If you have
@@ -594,7 +557,7 @@ class GeSHi {
      *               {@link GeSHi->set_language_path()}
      * @since 1.0.0
      */
-    function __construct($source = '', $language = '', $path = '') {
+    public function __construct($source = '', $language = '', $path = '') {
         if ( is_string($source) && ($source !== '') ) {
             $this->set_source($source);
         }
@@ -608,9 +571,9 @@ class GeSHi {
      * Returns the version of GeSHi
      *
      * @return string
-     * @since 1 0.8.11
+     * @since  1.0.8.11
      */
-    function get_version()
+    public function get_version()
     {
         return GESHI_VERSION;
     }
@@ -622,7 +585,7 @@ class GeSHi {
      * @return string|false An error message if there has been an error, else false
      * @since  1.0.0
      */
-    function error() {
+    public function error() {
         if ($this->error) {
             //Put some template variables for debugging here ...
             $debug_tpl_vars = array(
@@ -646,7 +609,7 @@ class GeSHi {
      * @return string The name for the current language
      * @since  1.0.2
      */
-    function get_language_name() {
+    public function get_language_name() {
         if (GESHI_ERROR_NO_SUCH_LANG == $this->error) {
             return $this->language_data['LANG_NAME'] . ' (Unknown Language)';
         }
@@ -656,10 +619,10 @@ class GeSHi {
     /**
      * Sets the source code for this object
      *
-     * @param string The source code to highlight
+     * @param string $source The source code to highlight
      * @since 1.0.0
      */
-    function set_source($source) {
+    public function set_source($source) {
         $this->source = $source;
         $this->highlight_extra_lines = array();
     }
@@ -670,10 +633,14 @@ class GeSHi {
      * @note since 1.0.8 this function won't reset language-settings by default anymore!
      *       if you need this set $force_reset = true
      *
-     * @param string The name of the language to use
+     * @param string $language    The name of the language to use
+     * @param bool   $force_reset
      * @since 1.0.0
      */
-    function set_language($language, $force_reset = false) {
+    public function set_language($language, $force_reset = false) {
+        $this->error = false;
+        $this->strict_mode = GESHI_NEVER;
+
         if ($force_reset) {
             $this->loaded_language = false;
         }
@@ -692,9 +659,6 @@ class GeSHi {
 
         $this->language = $language;
 
-        $this->error = false;
-        $this->strict_mode = GESHI_NEVER;
-
         //Check if we can read the desired file
         if (!is_readable($file_name)) {
             $this->error = GESHI_ERROR_NO_SUCH_LANG;
@@ -710,14 +674,14 @@ class GeSHi {
      * that this path is relative to the directory of the script that included
      * geshi.php, NOT geshi.php itself.
      *
-     * @param string The path to the language directory
+     * @param string $path The path to the language directory
      * @since 1.0.0
      * @deprecated The path to the language files should now be automatically
      *             detected, so this method should no longer be needed. The
      *             1.1.X branch handles manual setting of the path differently
      *             so this method will disappear in 1.2.0.
      */
-    function set_language_path($path) {
+    public function set_language_path($path) {
         if(strpos($path,':')) {
             //Security Fix to prevent external directories using fopen wrappers.
             if(DIRECTORY_SEPARATOR == "\\") {
@@ -748,10 +712,10 @@ class GeSHi {
 
     /**
      * Get supported langs or an associative array lang=>full_name.
-     * @param boolean $longnames
+     * @param boolean $full_names
      * @return array
      */
-    function get_supported_languages($full_names=false)
+    public function get_supported_languages($full_names=false)
     {
         // return array
         $back = array();
@@ -802,7 +766,7 @@ class GeSHi {
      * @param string $language short langname (html4strict for example)
      * @return mixed
      */
-    function get_language_fullname($language)
+    public function get_language_fullname($language)
     {
         //Clean up the language name to prevent malicious code injection
         $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language);
@@ -839,10 +803,10 @@ class GeSHi {
      * From 1.0.7.2, you can use GESHI_HEADER_NONE to specify that no header code
      * should be outputted.
      *
-     * @param int The type of header to be used
+     * @param int $type The type of header to be used
      * @since 1.0.0
      */
-    function set_header_type($type) {
+    public function set_header_type($type) {
         //Check if we got a valid header type
         if (!in_array($type, array(GESHI_HEADER_NONE, GESHI_HEADER_DIV,
             GESHI_HEADER_PRE, GESHI_HEADER_PRE_VALID, GESHI_HEADER_PRE_TABLE))) {
@@ -859,11 +823,11 @@ class GeSHi {
      * when this object is parsed. The style should be a
      * string of valid stylesheet declarations
      *
-     * @param string  The overall style for the outputted code block
-     * @param boolean Whether to merge the styles with the current styles or not
+     * @param string  $style             The overall style for the outputted code block
+     * @param boolean $preserve_defaults Whether to merge the styles with the current styles or not
      * @since 1.0.0
      */
-    function set_overall_style($style, $preserve_defaults = false) {
+    public function set_overall_style($style, $preserve_defaults = false) {
         if (!$preserve_defaults) {
             $this->overall_style = $style;
         } else {
@@ -876,10 +840,10 @@ class GeSHi {
      * class can then be used in a stylesheet to style this object's
      * output
      *
-     * @param string The class name to use for this block of code
+     * @param string $class The class name to use for this block of code
      * @since 1.0.0
      */
-    function set_overall_class($class) {
+    public function set_overall_class($class) {
         $this->overall_class = $class;
     }
 
@@ -887,10 +851,10 @@ class GeSHi {
      * Sets the overall id for this block of code. This id can then
      * be used in a stylesheet to style this object's output
      *
-     * @param string The ID to use for this block of code
+     * @param string $id The ID to use for this block of code
      * @since 1.0.0
      */
-    function set_overall_id($id) {
+    public function set_overall_id($id) {
         $this->overall_id = $id;
     }
 
@@ -898,10 +862,10 @@ class GeSHi {
      * Sets whether CSS classes should be used to highlight the source. Default
      * is off, calling this method with no arguments will turn it on
      *
-     * @param boolean Whether to turn classes on or not
+     * @param boolean $flag Whether to turn classes on or not
      * @since 1.0.0
      */
-    function enable_classes($flag = true) {
+    public function enable_classes($flag = true) {
         $this->use_classes = ($flag) ? true : false;
     }
 
@@ -916,11 +880,11 @@ class GeSHi {
      * code will have the same style as the line number! Consult the
      * GeSHi documentation for more information about this.
      *
-     * @param string  The style to use for actual code
-     * @param boolean Whether to merge the current styles with the new styles
+     * @param string  $style             The style to use for actual code
+     * @param boolean $preserve_defaults Whether to merge the current styles with the new styles
      * @since 1.0.2
      */
-    function set_code_style($style, $preserve_defaults = false) {
+    public function set_code_style($style, $preserve_defaults = false) {
         if (!$preserve_defaults) {
             $this->code_style = $style;
         } else {
@@ -931,16 +895,16 @@ class GeSHi {
     /**
      * Sets the styles for the line numbers.
      *
-     * @param string The style for the line numbers that are "normal"
-     * @param string|boolean If a string, this is the style of the line
+     * @param string         $style1 The style for the line numbers that are "normal"
+     * @param string|boolean $style2 If a string, this is the style of the line
      *        numbers that are "fancy", otherwise if boolean then this
      *        defines whether the normal styles should be merged with the
      *        new normal styles or not
-     * @param boolean If set, is the flag for whether to merge the "fancy"
+     * @param boolean        $preserve_defaults If set, is the flag for whether to merge the "fancy"
      *        styles with the current styles or not
      * @since 1.0.2
      */
-    function set_line_style($style1, $style2 = '', $preserve_defaults = false) {
+    public function set_line_style($style1, $style2 = '', $preserve_defaults = false) {
         //Check if we got 2 or three parameters
         if (is_bool($style2)) {
             $preserve_defaults = $style2;
@@ -970,11 +934,11 @@ class GeSHi {
      * are to be fancy. For example, if the value of this parameter is 5 then every
      * 5th line will be fancy.
      *
-     * @param int How line numbers should be displayed
-     * @param int Defines which lines are fancy
+     * @param int $flag    How line numbers should be displayed
+     * @param int $nth_row Defines which lines are fancy
      * @since 1.0.0
      */
-    function enable_line_numbers($flag, $nth_row = 5) {
+    public function enable_line_numbers($flag, $nth_row = 5) {
         if (GESHI_NO_LINE_NUMBERS != $flag && GESHI_NORMAL_LINE_NUMBERS != $flag
             && GESHI_FANCY_LINE_NUMBERS != $flag) {
             $this->error = GESHI_ERROR_INVALID_LINE_NUMBER_TYPE;
@@ -989,10 +953,10 @@ class GeSHi {
      * Set it to false if you want to manipulate the output or manually display
      * the code in an ordered list.
      *
-     * @param boolean Wether multiline spans are allowed or not
+     * @param boolean $flag Wether multiline spans are allowed or not
      * @since 1.0.7.22
      */
-    function enable_multiline_span($flag) {
+    public function enable_multiline_span($flag) {
         $this->allow_multiline_span = (bool) $flag;
     }
 
@@ -1002,7 +966,7 @@ class GeSHi {
      * @see enable_multiline_span
      * @return bool
      */
-    function get_multiline_span() {
+    public function get_multiline_span() {
         return $this->allow_multiline_span;
     }
 
@@ -1011,13 +975,13 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param int     The key of the keyword group to change the styles of
-     * @param string  The style to make the keywords
-     * @param boolean Whether to merge the new styles with the old or just
+     * @param int     $key               The key of the keyword group to change the styles of
+     * @param string  $style             The style to make the keywords
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
      *                to overwrite them
      * @since 1.0.0
      */
-    function set_keyword_group_style($key, $style, $preserve_defaults = false) {
+    public function set_keyword_group_style($key, $style, $preserve_defaults = false) {
         //Set the style for this keyword group
         if('*' == $key) {
             foreach($this->language_data['STYLES']['KEYWORDS'] as $_key => $_value) {
@@ -1044,11 +1008,11 @@ class GeSHi {
     /**
      * Turns highlighting on/off for a keyword group
      *
-     * @param int     The key of the keyword group to turn on or off
-     * @param boolean Whether to turn highlighting for that group on or off
+     * @param int     $key  The key of the keyword group to turn on or off
+     * @param boolean $flag Whether to turn highlighting for that group on or off
      * @since 1.0.0
      */
-    function set_keyword_group_highlighting($key, $flag = true) {
+    public function set_keyword_group_highlighting($key, $flag = true) {
         $this->lexic_permissions['KEYWORDS'][$key] = ($flag) ? true : false;
     }
 
@@ -1057,13 +1021,13 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param int     The key of the comment group to change the styles of
-     * @param string  The style to make the comments
-     * @param boolean Whether to merge the new styles with the old or just
+     * @param int     $key               The key of the comment group to change the styles of
+     * @param string  $style             The style to make the comments
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
      *                to overwrite them
      * @since 1.0.0
      */
-    function set_comments_style($key, $style, $preserve_defaults = false) {
+    public function set_comments_style($key, $style, $preserve_defaults = false) {
         if('*' == $key) {
             foreach($this->language_data['STYLES']['COMMENTS'] as $_key => $_value) {
                 if (!$preserve_defaults) {
@@ -1084,11 +1048,11 @@ class GeSHi {
     /**
      * Turns highlighting on/off for comment groups
      *
-     * @param int     The key of the comment group to turn on or off
-     * @param boolean Whether to turn highlighting for that group on or off
+     * @param int     $key  The key of the comment group to turn on or off
+     * @param boolean $flag Whether to turn highlighting for that group on or off
      * @since 1.0.0
      */
-    function set_comments_highlighting($key, $flag = true) {
+    public function set_comments_highlighting($key, $flag = true) {
         $this->lexic_permissions['COMMENTS'][$key] = ($flag) ? true : false;
     }
 
@@ -1097,12 +1061,13 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param string  The style to make the escape characters
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
+     * @param string  $style             The style to make the escape characters
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
+     *                                   to overwrite them
+     * @param int     $group             Tells the group of symbols for which style should be set.
      * @since 1.0.0
      */
-    function set_escape_characters_style($style, $preserve_defaults = false, $group = 0) {
+    public function set_escape_characters_style($style, $preserve_defaults = false, $group = 0) {
         if (!$preserve_defaults) {
             $this->language_data['STYLES']['ESCAPE_CHAR'][$group] = $style;
         } else {
@@ -1113,10 +1078,10 @@ class GeSHi {
     /**
      * Turns highlighting on/off for escaped characters
      *
-     * @param boolean Whether to turn highlighting for escape characters on or off
+     * @param boolean $flag Whether to turn highlighting for escape characters on or off
      * @since 1.0.0
      */
-    function set_escape_characters_highlighting($flag = true) {
+    public function set_escape_characters_highlighting($flag = true) {
         $this->lexic_permissions['ESCAPE_CHAR'] = ($flag) ? true : false;
     }
 
@@ -1128,13 +1093,13 @@ class GeSHi {
      * This method is DEPRECATED: use set_symbols_style instead.
      * This method will be removed in 1.2.X
      *
-     * @param string  The style to make the brackets
-     * @param boolean Whether to merge the new styles with the old or just
+     * @param string  $style             The style to make the brackets
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
      *                to overwrite them
      * @since 1.0.0
      * @deprecated In favour of set_symbols_style
      */
-    function set_brackets_style($style, $preserve_defaults = false) {
+    public function set_brackets_style($style, $preserve_defaults = false) {
         if (!$preserve_defaults) {
             $this->language_data['STYLES']['BRACKETS'][0] = $style;
         } else {
@@ -1148,11 +1113,11 @@ class GeSHi {
      * This method is DEPRECATED: use set_symbols_highlighting instead.
      * This method will be remove in 1.2.X
      *
-     * @param boolean Whether to turn highlighting for brackets on or off
+     * @param boolean $flag Whether to turn highlighting for brackets on or off
      * @since 1.0.0
      * @deprecated In favour of set_symbols_highlighting
      */
-    function set_brackets_highlighting($flag) {
+    public function set_brackets_highlighting($flag) {
         $this->lexic_permissions['BRACKETS'] = ($flag) ? true : false;
     }
 
@@ -1161,13 +1126,13 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param string  The style to make the symbols
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @param int     Tells the group of symbols for which style should be set.
+     * @param string  $style             The style to make the symbols
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
+     *                                   to overwrite them
+     * @param int     $group             Tells the group of symbols for which style should be set.
      * @since 1.0.1
      */
-    function set_symbols_style($style, $preserve_defaults = false, $group = 0) {
+    public function set_symbols_style($style, $preserve_defaults = false, $group = 0) {
         // Update the style of symbols
         if (!$preserve_defaults) {
             $this->language_data['STYLES']['SYMBOLS'][$group] = $style;
@@ -1184,10 +1149,10 @@ class GeSHi {
     /**
      * Turns highlighting on/off for symbols
      *
-     * @param boolean Whether to turn highlighting for symbols on or off
+     * @param boolean $flag Whether to turn highlighting for symbols on or off
      * @since 1.0.0
      */
-    function set_symbols_highlighting($flag) {
+    public function set_symbols_highlighting($flag) {
         // Update lexic permissions for this symbol group
         $this->lexic_permissions['SYMBOLS'] = ($flag) ? true : false;
 
@@ -1200,13 +1165,13 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param string  The style to make the escape characters
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @param int     Tells the group of strings for which style should be set.
+     * @param string  $style             The style to make the escape characters
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
+     *                                   to overwrite them
+     * @param int     $group             Tells the group of strings for which style should be set.
      * @since 1.0.0
      */
-    function set_strings_style($style, $preserve_defaults = false, $group = 0) {
+    public function set_strings_style($style, $preserve_defaults = false, $group = 0) {
         if (!$preserve_defaults) {
             $this->language_data['STYLES']['STRINGS'][$group] = $style;
         } else {
@@ -1217,10 +1182,10 @@ class GeSHi {
     /**
      * Turns highlighting on/off for strings
      *
-     * @param boolean Whether to turn highlighting for strings on or off
+     * @param boolean $flag Whether to turn highlighting for strings on or off
      * @since 1.0.0
      */
-    function set_strings_highlighting($flag) {
+    public function set_strings_highlighting($flag) {
         $this->lexic_permissions['STRINGS'] = ($flag) ? true : false;
     }
 
@@ -1229,13 +1194,13 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param string  The style to make the script blocks
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @param int     Tells the group of script blocks for which style should be set.
+     * @param string  $style             The style to make the script blocks
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
+     *                                   to overwrite them
+     * @param int     $group             Tells the group of script blocks for which style should be set.
      * @since 1.0.8.4
      */
-    function set_script_style($style, $preserve_defaults = false, $group = 0) {
+    public function set_script_style($style, $preserve_defaults = false, $group = 0) {
         // Update the style of symbols
         if (!$preserve_defaults) {
             $this->language_data['STYLES']['SCRIPT'][$group] = $style;
@@ -1249,13 +1214,13 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param string  The style to make the numbers
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @param int     Tells the group of numbers for which style should be set.
+     * @param string  $style             The style to make the numbers
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
+     *                                   to overwrite them
+     * @param int     $group             Tells the group of numbers for which style should be set.
      * @since 1.0.0
      */
-    function set_numbers_style($style, $preserve_defaults = false, $group = 0) {
+    public function set_numbers_style($style, $preserve_defaults = false, $group = 0) {
         if (!$preserve_defaults) {
             $this->language_data['STYLES']['NUMBERS'][$group] = $style;
         } else {
@@ -1266,10 +1231,10 @@ class GeSHi {
     /**
      * Turns highlighting on/off for numbers
      *
-     * @param boolean Whether to turn highlighting for numbers on or off
+     * @param boolean $flag Whether to turn highlighting for numbers on or off
      * @since 1.0.0
      */
-    function set_numbers_highlighting($flag) {
+    public function set_numbers_highlighting($flag) {
         $this->lexic_permissions['NUMBERS'] = ($flag) ? true : false;
     }
 
@@ -1280,13 +1245,13 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param int     The key of the object splitter to change the styles of
-     * @param string  The style to make the methods
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
+     * @param int     $key               The key of the object splitter to change the styles of
+     * @param string  $style             The style to make the methods
+     * @param boolean $preserve_defaults Whether to merge the new styles with the old or just
+     *                                   to overwrite them
      * @since 1.0.0
      */
-    function set_methods_style($key, $style, $preserve_defaults = false) {
+    public function set_methods_style($key, $style, $preserve_defaults = false) {
         if (!$preserve_defaults) {
             $this->language_data['STYLES']['METHODS'][$key] = $style;
         } else {
@@ -1297,10 +1262,10 @@ class GeSHi {
     /**
      * Turns highlighting on/off for methods
      *
-     * @param boolean Whether to turn highlighting for methods on or off
+     * @param boolean $flag Whether to turn highlighting for methods on or off
      * @since 1.0.0
      */
-    function set_methods_highlighting($flag) {
+    public function set_methods_highlighting($flag) {
         $this->lexic_permissions['METHODS'] = ($flag) ? true : false;
     }
 
@@ -1309,12 +1274,14 @@ class GeSHi {
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
      *
-     * @param string  The style to make the regular expression matches
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
+     * @param string  $key               The style to make the regular expression matches
+     * @param boolean $style             Whether to merge the new styles with the old or just
+     *                                   to overwrite them
+     * @param bool    $preserve_defaults Whether to merge the new styles with the old or just
+     *                                to overwrite them
      * @since 1.0.0
      */
-    function set_regexps_style($key, $style, $preserve_defaults = false) {
+    public function set_regexps_style($key, $style, $preserve_defaults = false) {
         if (!$preserve_defaults) {
             $this->language_data['STYLES']['REGEXPS'][$key] = $style;
         } else {
@@ -1325,22 +1292,22 @@ class GeSHi {
     /**
      * Turns highlighting on/off for regexps
      *
-     * @param int     The key of the regular expression group to turn on or off
-     * @param boolean Whether to turn highlighting for the regular expression group on or off
+     * @param int     $key  The key of the regular expression group to turn on or off
+     * @param boolean $flag Whether to turn highlighting for the regular expression group on or off
      * @since 1.0.0
      */
-    function set_regexps_highlighting($key, $flag) {
+    public function set_regexps_highlighting($key, $flag) {
         $this->lexic_permissions['REGEXPS'][$key] = ($flag) ? true : false;
     }
 
     /**
      * Sets whether a set of keywords are checked for in a case sensitive manner
      *
-     * @param int The key of the keyword group to change the case sensitivity of
-     * @param boolean Whether to check in a case sensitive manner or not
+     * @param int     $key  The key of the keyword group to change the case sensitivity of
+     * @param boolean $case Whether to check in a case sensitive manner or not
      * @since 1.0.0
      */
-    function set_case_sensitivity($key, $case) {
+    public function set_case_sensitivity($key, $case) {
         $this->language_data['CASE_SENSITIVE'][$key] = ($case) ? true : false;
     }
 
@@ -1351,10 +1318,10 @@ class GeSHi {
      *  - GESHI_CAPS_UPPER: convert all keywords to uppercase where found
      *  - GESHI_CAPS_LOWER: convert all keywords to lowercase where found
      *
-     * @param int A constant specifying what to do with matched keywords
+     * @param int $case A constant specifying what to do with matched keywords
      * @since 1.0.1
      */
-    function set_case_keywords($case) {
+    public function set_case_keywords($case) {
         if (in_array($case, array(
             GESHI_CAPS_NO_CHANGE, GESHI_CAPS_UPPER, GESHI_CAPS_LOWER))) {
             $this->language_data['CASE_KEYWORDS'] = $case;
@@ -1366,10 +1333,10 @@ class GeSHi {
      *
      * Widths below zero are ignored
      *
-     * @param int The tab width
+     * @param int $width The tab width
      * @since 1.0.0
      */
-    function set_tab_width($width) {
+    public function set_tab_width($width) {
         $this->tab_width = intval($width);
 
         //Check if it fit's the constraints:
@@ -1382,10 +1349,10 @@ class GeSHi {
     /**
      * Sets whether or not to use tab-stop width specifed by language
      *
-     * @param boolean Whether to use language-specific tab-stop widths
+     * @param boolean $use Whether to use language-specific tab-stop widths
      * @since 1.0.7.20
      */
-    function set_use_language_tab_width($use) {
+    public function set_use_language_tab_width($use) {
         $this->use_language_tab_width = (bool) $use;
     }
 
@@ -1396,7 +1363,7 @@ class GeSHi {
      * @return int Tab width
      * @since 1.0.7.20
      */
-    function get_real_tab_width() {
+    public function get_real_tab_width() {
         if (!$this->use_language_tab_width ||
             !isset($this->language_data['TAB_WIDTH'])) {
             return $this->tab_width;
@@ -1410,10 +1377,10 @@ class GeSHi {
      * method without parameters will turn it on. See documentation
      * for more details on strict mode and where to use it.
      *
-     * @param boolean Whether to enable strict mode or not
+     * @param boolean $mode Whether to enable strict mode or not
      * @since 1.0.0
      */
-    function enable_strict_mode($mode = true) {
+    public function enable_strict_mode($mode = true) {
         if (GESHI_MAYBE == $this->language_data['STRICT_MODE_APPLIES']) {
             $this->strict_mode = ($mode) ? GESHI_ALWAYS : GESHI_NEVER;
         }
@@ -1426,7 +1393,7 @@ class GeSHi {
      * @todo  Rewrite with array traversal
      * @deprecated In favour of enable_highlighting
      */
-    function disable_highlighting() {
+    public function disable_highlighting() {
         $this->enable_highlighting(false);
     }
 
@@ -1437,10 +1404,10 @@ class GeSHi {
      * to enable (true) or disable (false) all highlighting.
      *
      * @since 1.0.0
-     * @param boolean A flag specifying whether to enable or disable all highlighting
+     * @param boolean $flag A flag specifying whether to enable or disable all highlighting
      * @todo  Rewrite with array traversal
      */
-    function enable_highlighting($flag = true) {
+    public function enable_highlighting($flag = true) {
         $flag = $flag ? true : false;
         foreach ($this->lexic_permissions as $key => $value) {
             if (is_array($value)) {
@@ -1460,13 +1427,14 @@ class GeSHi {
      * Given a file extension, this method returns either a valid geshi language
      * name, or the empty string if it couldn't be found
      *
-     * @param string The extension to get a language name for
-     * @param array  A lookup array to use instead of the default one
+     * @param string $extension The extension to get a language name for
+     * @param array  $lookup    A lookup array to use instead of the default one
      * @since 1.0.5
      * @todo Re-think about how this method works (maybe make it private and/or make it
      *       a extension->lang lookup?)
+     * @return int|string
      */
-    static function get_language_name_from_extension( $extension, $lookup = array() ) {
+    public static function get_language_name_from_extension( $extension, $lookup = array() ) {
         $extension = strtolower($extension);
 
         if ( !is_array($lookup) || empty($lookup)) {
@@ -1568,12 +1536,12 @@ class GeSHi {
      *   'lang_name' ...
      * );</pre>
      *
-     * @param string The filename to load the source from
-     * @param array  A lookup array to use instead of the default one
+     * @param string $file_name The filename to load the source from
+     * @param array  $lookup    A lookup array to use instead of the default one
      * @todo Complete rethink of this and above method
      * @since 1.0.5
      */
-    function load_from_file($file_name, $lookup = array()) {
+    public function load_from_file($file_name, $lookup = array()) {
         if (is_readable($file_name)) {
             $this->set_source(file_get_contents($file_name));
             $this->set_language(self::get_language_name_from_extension(substr(strrchr($file_name, '.'), 1), $lookup));
@@ -1585,11 +1553,11 @@ class GeSHi {
     /**
      * Adds a keyword to a keyword group for highlighting
      *
-     * @param int    The key of the keyword group to add the keyword to
-     * @param string The word to add to the keyword group
+     * @param int    $key  The key of the keyword group to add the keyword to
+     * @param string $word The word to add to the keyword group
      * @since 1.0.0
      */
-    function add_keyword($key, $word) {
+    public function add_keyword($key, $word) {
         if (!is_array($this->language_data['KEYWORDS'][$key])) {
             $this->language_data['KEYWORDS'][$key] = array();
         }
@@ -1607,9 +1575,9 @@ class GeSHi {
     /**
      * Removes a keyword from a keyword group
      *
-     * @param int    The key of the keyword group to remove the keyword from
-     * @param string The word to remove from the keyword group
-     * @param bool   Wether to automatically recompile the optimized regexp list or not.
+     * @param int    $key       The key of the keyword group to remove the keyword from
+     * @param string $word      The word to remove from the keyword group
+     * @param bool   $recompile Wether to automatically recompile the optimized regexp list or not.
      *               Note: if you set this to false and @see GeSHi->parse_code() was already called once,
      *               for the current language, you have to manually call @see GeSHi->optimize_keyword_group()
      *               or the removed keyword will stay in cache and still be highlighted! On the other hand
@@ -1617,7 +1585,7 @@ class GeSHi {
      *               remove a lot of keywords.
      * @since 1.0.0
      */
-    function remove_keyword($key, $word, $recompile = true) {
+    public function remove_keyword($key, $word, $recompile = true) {
         $key_to_remove = array_search($word, $this->language_data['KEYWORDS'][$key]);
         if ($key_to_remove !== false) {
             unset($this->language_data['KEYWORDS'][$key][$key_to_remove]);
@@ -1632,13 +1600,14 @@ class GeSHi {
     /**
      * Creates a new keyword group
      *
-     * @param int    The key of the keyword group to create
-     * @param string The styles for the keyword group
-     * @param boolean Whether the keyword group is case sensitive ornot
-     * @param array  The words to use for the keyword group
+     * @param int     $key            The key of the keyword group to create
+     * @param string  $styles         The styles for the keyword group
+     * @param boolean $case_sensitive Whether the keyword group is case sensitive ornot
+     * @param array   $words          The words to use for the keyword group
      * @since 1.0.0
+     * @return bool
      */
-    function add_keyword_group($key, $styles, $case_sensitive = true, $words = array()) {
+    public function add_keyword_group($key, $styles, $case_sensitive = true, $words = array()) {
         $words = (array) $words;
         if  (empty($words)) {
             // empty word lists mess up highlighting
@@ -1655,15 +1624,16 @@ class GeSHi {
         if ($this->parse_cache_built) {
             $this->optimize_keyword_group($key);
         }
+        return true;
     }
 
     /**
      * Removes a keyword group
      *
-     * @param int    The key of the keyword group to remove
+     * @param int $key The key of the keyword group to remove
      * @since 1.0.0
      */
-    function remove_keyword_group ($key) {
+    public function remove_keyword_group ($key) {
         //Remove the keyword group internally
         unset($this->language_data['KEYWORDS'][$key]);
         unset($this->lexic_permissions['KEYWORDS'][$key]);
@@ -1677,10 +1647,10 @@ class GeSHi {
     /**
      * compile optimized regexp list for keyword group
      *
-     * @param int   The key of the keyword group to compile & optimize
+     * @param int $key The key of the keyword group to compile & optimize
      * @since 1.0.8
      */
-    function optimize_keyword_group($key) {
+    public function optimize_keyword_group($key) {
         $this->language_data['CACHED_KEYWORD_LISTS'][$key] =
             $this->optimize_regexp_list($this->language_data['KEYWORDS'][$key]);
         $space_as_whitespace = false;
@@ -1707,40 +1677,40 @@ class GeSHi {
     /**
      * Sets the content of the header block
      *
-     * @param string The content of the header block
+     * @param string $content The content of the header block
      * @since 1.0.2
      */
-    function set_header_content($content) {
+    public function set_header_content($content) {
         $this->header_content = $content;
     }
 
     /**
      * Sets the content of the footer block
      *
-     * @param string The content of the footer block
+     * @param string $content The content of the footer block
      * @since 1.0.2
      */
-    function set_footer_content($content) {
+    public function set_footer_content($content) {
         $this->footer_content = $content;
     }
 
     /**
      * Sets the style for the header content
      *
-     * @param string The style for the header content
+     * @param string $style The style for the header content
      * @since 1.0.2
      */
-    function set_header_content_style($style) {
+    public function set_header_content_style($style) {
         $this->header_content_style = $style;
     }
 
     /**
      * Sets the style for the footer content
      *
-     * @param string The style for the footer content
+     * @param string $style The style for the footer content
      * @since 1.0.2
      */
-    function set_footer_content_style($style) {
+    public function set_footer_content_style($style) {
         $this->footer_content_style = $style;
     }
 
@@ -1748,45 +1718,45 @@ class GeSHi {
      * Sets whether to force a surrounding block around
      * the highlighted code or not
      *
-     * @param boolean Tells whether to enable or disable this feature
+     * @param boolean $flag Tells whether to enable or disable this feature
      * @since 1.0.7.20
      */
-    function enable_inner_code_block($flag) {
+    public function enable_inner_code_block($flag) {
         $this->force_code_block = (bool)$flag;
     }
 
     /**
      * Sets the base URL to be used for keywords
      *
-     * @param int The key of the keyword group to set the URL for
-     * @param string The URL to set for the group. If {FNAME} is in
-     *               the url somewhere, it is replaced by the keyword
-     *               that the URL is being made for
+     * @param int    $group The key of the keyword group to set the URL for
+     * @param string $url   The URL to set for the group. If {FNAME} is in
+     *                      the url somewhere, it is replaced by the keyword
+     *                      that the URL is being made for
      * @since 1.0.2
      */
-    function set_url_for_keyword_group($group, $url) {
+    public function set_url_for_keyword_group($group, $url) {
         $this->language_data['URLS'][$group] = $url;
     }
 
     /**
      * Sets styles for links in code
      *
-     * @param int A constant that specifies what state the style is being
-     *            set for - e.g. :hover or :visited
-     * @param string The styles to use for that state
+     * @param int    $type   A constant that specifies what state the style is being
+     *                       set for - e.g. :hover or :visited
+     * @param string $styles The styles to use for that state
      * @since 1.0.2
      */
-    function set_link_styles($type, $styles) {
+    public function set_link_styles($type, $styles) {
         $this->link_styles[$type] = $styles;
     }
 
     /**
      * Sets the target for links in code
      *
-     * @param string The target for links in the code, e.g. _blank
+     * @param string $target The target for links in the code, e.g. _blank
      * @since 1.0.3
      */
-    function set_link_target($target) {
+    public function set_link_target($target) {
         if (!$target) {
             $this->link_target = '';
         } else {
@@ -1797,32 +1767,32 @@ class GeSHi {
     /**
      * Sets styles for important parts of the code
      *
-     * @param string The styles to use on important parts of the code
+     * @param string $styles The styles to use on important parts of the code
      * @since 1.0.2
      */
-    function set_important_styles($styles) {
+    public function set_important_styles($styles) {
         $this->important_styles = $styles;
     }
 
     /**
      * Sets whether context-important blocks are highlighted
      *
-     * @param boolean Tells whether to enable or disable highlighting of important blocks
+     * @param boolean $flag Tells whether to enable or disable highlighting of important blocks
      * @todo REMOVE THIS SHIZ FROM GESHI!
      * @deprecated
      * @since 1.0.2
      */
-    function enable_important_blocks($flag) {
+    public function enable_important_blocks($flag) {
         $this->enable_important_blocks = ( $flag ) ? true : false;
     }
 
     /**
      * Whether CSS IDs should be added to each line
      *
-     * @param boolean If true, IDs will be added to each line.
+     * @param boolean $flag If true, IDs will be added to each line.
      * @since 1.0.2
      */
-    function enable_ids($flag = true) {
+    public function enable_ids($flag = true) {
         $this->add_ids = ($flag) ? true : false;
     }
 
@@ -1831,16 +1801,16 @@ class GeSHi {
      *
      * The extra style parameter was added in 1.0.7.21.
      *
-     * @param mixed An array of line numbers to highlight, or just a line
-     *              number on its own.
-     * @param string A string specifying the style to use for this line.
-     *              If null is specified, the default style is used.
-     *              If false is specified, the line will be removed from
-     *              special highlighting
+     * @param mixed  $lines An array of line numbers to highlight, or just a line
+     *                      number on its own.
+     * @param string $style A string specifying the style to use for this line.
+     *                      If null is specified, the default style is used.
+     *                      If false is specified, the line will be removed from
+     *                      special highlighting
      * @since 1.0.2
      * @todo  Some data replication here that could be cut down on
      */
-    function highlight_lines_extra($lines, $style = null) {
+    public function highlight_lines_extra($lines, $style = null) {
         if (is_array($lines)) {
             //Split up the job using single lines at a time
             foreach ($lines as $line) {
@@ -1866,20 +1836,20 @@ class GeSHi {
     /**
      * Sets the style for extra-highlighted lines
      *
-     * @param string The style for extra-highlighted lines
+     * @param string $styles The style for extra-highlighted lines
      * @since 1.0.2
      */
-    function set_highlight_lines_extra_style($styles) {
+    public function set_highlight_lines_extra_style($styles) {
         $this->highlight_extra_lines_style = $styles;
     }
 
     /**
      * Sets the line-ending
      *
-     * @param string The new line-ending
+     * @param string $line_ending The new line-ending
      * @since 1.0.2
      */
-    function set_line_ending($line_ending) {
+    public function set_line_ending($line_ending) {
         $this->line_ending = (string)$line_ending;
     }
 
@@ -1895,10 +1865,10 @@ class GeSHi {
      * has support for the CSS method, but (of course) IE doesn't
      * so it's not worth doing it the CSS way yet.
      *
-     * @param int The number to start line numbers at
+     * @param int $number The number to start line numbers at
      * @since 1.0.2
      */
-    function start_line_numbers_at($number) {
+    public function start_line_numbers_at($number) {
         $this->line_numbers_start = abs(intval($number));
     }
 
@@ -1911,10 +1881,10 @@ class GeSHi {
      * Maybe in a future version it may make a return for speed reasons, but
      * I doubt it.
      *
-     * @param string The encoding to use for the source
+     * @param string $encoding The encoding to use for the source
      * @since 1.0.3
      */
-    function set_encoding($encoding) {
+    public function set_encoding($encoding) {
         if ($encoding) {
           $this->encoding = strtolower($encoding);
         }
@@ -1923,10 +1893,10 @@ class GeSHi {
     /**
      * Turns linking of keywords on or off.
      *
-     * @param boolean If true, links will be added to keywords
+     * @param boolean $enable If true, links will be added to keywords
      * @since 1.0.2
      */
-    function enable_keyword_links($enable = true) {
+    public function enable_keyword_links($enable = true) {
         $this->keyword_links = (bool) $enable;
     }
 
@@ -1937,9 +1907,8 @@ class GeSHi {
      * preprocessed
      *
      * @since 1.0.8
-     * @access private
      */
-    function build_style_cache() {
+    protected function build_style_cache() {
         //Build the style cache needed to highlight numbers appropriate
         if($this->lexic_permissions['NUMBERS']) {
             //First check what way highlighting information for numbers are given
@@ -1988,9 +1957,8 @@ class GeSHi {
      * This function makes stylesheet generators much faster as they do not need these caches.
      *
      * @since 1.0.8
-     * @access private
      */
-    function build_parse_cache() {
+    protected function build_parse_cache() {
         // cache symbol regexp
         //As this is a costy operation, we avoid doing it for multiple groups ...
         //Instead we perform it for all symbols at once.
@@ -2172,7 +2140,7 @@ class GeSHi {
      *
      * @since 1.0.0
      */
-    function parse_code () {
+    public function parse_code () {
         // Start the timer
         $start_time = microtime();
 
@@ -2268,8 +2236,7 @@ class GeSHi {
                          *  - Group 1 is the opener
                          *  - Group 2 is the closer
                          */
-                        if(!GESHI_PHP_PRE_433 && //Needs proper rewrite to work with PHP >=4.3.0; 4.3.3 is guaranteed to work.
-                            preg_match($delimiters, $code, $matches_rx, PREG_OFFSET_CAPTURE, $i)) {
+                        if(preg_match($delimiters, $code, $matches_rx, PREG_OFFSET_CAPTURE, $i)) {
                             //We got a match ...
                             if(isset($matches_rx['start']) && isset($matches_rx['end']))
                             {
@@ -2516,15 +2483,8 @@ class GeSHi {
                                     continue;
                                 }
                                 $match_i = $comment_regexp_cache_per_key[$comment_key]['pos'];
-                            } elseif (
-                                //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
-                                (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $i), $match, PREG_OFFSET_CAPTURE)) ||
-                                (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $i))
-                                ) {
+                            } elseif (preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $i)) {
                                 $match_i = $match[0][1];
-                                if (GESHI_PHP_PRE_433) {
-                                    $match_i += $i;
-                                }
 
                                 $comment_regexp_cache_per_key[$comment_key] = array(
                                     'key' => $comment_key,
@@ -2624,15 +2584,8 @@ class GeSHi {
                                                 continue;
                                             }
                                             $match_i = $escape_regexp_cache_per_key[$escape_key]['pos'];
-                                        } elseif (
-                                            //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
-                                            (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $start), $match, PREG_OFFSET_CAPTURE)) ||
-                                            (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $start))
-                                            ) {
+                                        } elseif (preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $start)) {
                                             $match_i = $match[0][1];
-                                            if (GESHI_PHP_PRE_433) {
-                                                $match_i += $start;
-                                            }
 
                                             $escape_regexp_cache_per_key[$escape_key] = array(
                                                 'key' => $escape_key,
@@ -2700,7 +2653,7 @@ class GeSHi {
                                     if(function_exists('mb_substr')) {
                                         $es_char_m = mb_substr(substr($part, $es_pos+1, 16), 0, 1, $this->encoding);
                                         $string .= $es_char_m . '</span>';
-                                    } elseif (!GESHI_PHP_PRE_433 && 'utf-8' == $this->encoding) {
+                                    } elseif ('utf-8' == $this->encoding) {
                                         if(preg_match("/[\xC2-\xDF][\x80-\xBF]".
                                             "|\xE0[\xA0-\xBF][\x80-\xBF]".
                                             "|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}".
@@ -3141,11 +3094,10 @@ class GeSHi {
      * Swaps out spaces and tabs for HTML indentation. Not needed if
      * the code is in a pre block...
      *
-     * @param  string The source to indent (reference!)
+     * @param  string $result The source to indent (reference!)
      * @since  1.0.0
-     * @access private
      */
-    function indent(&$result) {
+    protected function indent(&$result) {
         /// Replace tabs with the correct number of spaces
         if (false !== strpos($result, "\t")) {
             $lines = explode("\n", $result);
@@ -3240,12 +3192,11 @@ class GeSHi {
     /**
      * Changes the case of a keyword for those languages where a change is asked for
      *
-     * @param  string The keyword to change the case of
+     * @param  string $instr The keyword to change the case of
      * @return string The keyword with its case changed
      * @since  1.0.0
-     * @access private
      */
-    function change_case($instr) {
+    protected function change_case($instr) {
         switch ($this->language_data['CASE_KEYWORDS']) {
             case GESHI_CAPS_UPPER:
                 return strtoupper($instr);
@@ -3259,14 +3210,13 @@ class GeSHi {
     /**
      * Handles replacements of keywords to include markup and links if requested
      *
-     * @param  string The keyword to add the Markup to
-     * @return The HTML for the match found
+     * @param  string $match The keyword to add the Markup to
+     * @return string The HTML for the match found
      * @since  1.0.8
-     * @access private
      *
      * @todo   Get rid of ender in keyword links
      */
-    function handle_keyword_replace($match) {
+    protected function handle_keyword_replace($match) {
         $k = $this->_kw_replace_group;
         $keyword = $match[0];
         $keyword_match = $match[1];
@@ -3301,11 +3251,13 @@ class GeSHi {
                             '{FNAME}',
                             '{FNAMEL}',
                             '{FNAMEU}',
+                            '{FNAMEUF}',
                             '.'),
                         array(
                             str_replace('+', '%20', urlencode($this->hsc($word))),
                             str_replace('+', '%20', urlencode($this->hsc(strtolower($word)))),
                             str_replace('+', '%20', urlencode($this->hsc(strtoupper($word)))),
+                            str_replace('+', '%20', urlencode($this->hsc(ucfirst($word)))),
                             '<DOT>'),
                         $this->language_data['URLS'][$k]
                     ) . '">';
@@ -3321,12 +3273,11 @@ class GeSHi {
      *
      * @note this is a callback, don't use it directly
      *
-     * @param array the matches array
-     * @return The highlighted string
+     * @param array $matches the matches array
+     * @return string The highlighted string
      * @since 1.0.8
-     * @access private
      */
-    function handle_regexps_callback($matches) {
+    protected function handle_regexps_callback($matches) {
         // before: "' style=\"' . call_user_func(\"$func\", '\\1') . '\"\\1|>'",
         return  ' style="' . call_user_func($this->language_data['STYLES']['REGEXPS'][$this->_rx_key], $matches[1]) . '"'. $matches[1] . '|>';
     }
@@ -3336,12 +3287,11 @@ class GeSHi {
      *
      * @note this is a callback, don't use it directly
      *
-     * @param array the matches array
+     * @param array $matches the matches array
      * @return string
      * @since 1.0.8
-     * @access private
      */
-    function handle_multiline_regexps($matches) {
+    protected function handle_multiline_regexps($matches) {
         $before = $this->_hmr_before;
         $after = $this->_hmr_after;
         if ($this->_hmr_replace) {
@@ -3369,12 +3319,12 @@ class GeSHi {
      * Takes a string that has no strings or comments in it, and highlights
      * stuff like keywords, numbers and methods.
      *
-     * @param string The string to parse for keyword, numbers etc.
+     * @param string $stuff_to_parse The string to parse for keyword, numbers etc.
      * @since 1.0.0
-     * @access private
      * @todo BUGGY! Why? Why not build string and return?
+     * @return string
      */
-    function parse_non_string_part($stuff_to_parse) {
+    protected function parse_non_string_part($stuff_to_parse) {
         $stuff_to_parse = ' ' . $this->hsc($stuff_to_parse);
 
         // Highlight keywords
@@ -3690,12 +3640,11 @@ class GeSHi {
     /**
      * Sets the time taken to parse the code
      *
-     * @param microtime The time when parsing started
-     * @param microtime The time when parsing ended
+     * @param string $start_time The time when parsing started as returned by @see microtime()
+     * @param string $end_time   The time when parsing ended as returned by @see microtime()
      * @since 1.0.2
-     * @access private
      */
-    function set_time($start_time, $end_time) {
+    protected function set_time($start_time, $end_time) {
         $start = explode(' ', $start_time);
         $end = explode(' ', $end_time);
         $this->time = $end[0] + $end[1] - $start[0] - $start[1];
@@ -3707,7 +3656,7 @@ class GeSHi {
      * @return double The time taken to parse the code
      * @since  1.0.2
      */
-    function get_time() {
+    public function get_time() {
         return $this->time;
     }
 
@@ -3715,9 +3664,8 @@ class GeSHi {
      * Merges arrays recursively, overwriting values of the first array with values of later arrays
      *
      * @since 1.0.8
-     * @access private
      */
-    function merge_arrays() {
+    protected function merge_arrays() {
         $arrays = func_get_args();
         $narrays = count($arrays);
 
@@ -3753,12 +3701,11 @@ class GeSHi {
     /**
      * Gets language information and stores it for later use
      *
-     * @param string The filename of the language file you want to load
+     * @param string $file_name The filename of the language file you want to load
      * @since 1.0.0
-     * @access private
      * @todo Needs to load keys for lexic permissions for keywords, regexps etc
      */
-    function load_language($file_name) {
+    protected function load_language($file_name) {
         if ($file_name == $this->loaded_language) {
             // this file is already loaded!
             return;
@@ -3853,11 +3800,10 @@ class GeSHi {
      * Takes the parsed code and various options, and creates the HTML
      * surrounding it to make it look nice.
      *
-     * @param  string The code already parsed (reference!)
+     * @param  string $parsed_code The code already parsed (reference!)
      * @since  1.0.0
-     * @access private
      */
-    function finalise(&$parsed_code) {
+    protected function finalise(&$parsed_code) {
         // Remove end parts of important declarations
         // This is BUGGY!! My fault for bad code: fix coming in 1.2
         // @todo Remove this crap
@@ -4100,9 +4046,8 @@ class GeSHi {
      *
      * @return string The header for the code block
      * @since  1.0.0
-     * @access private
      */
-    function header() {
+    protected function header() {
         // Get attributes needed
         /**
          * @todo   Document behaviour change - class is outputted regardless of whether
@@ -4180,9 +4125,8 @@ class GeSHi {
      *
      * @return string The footer for the code block
      * @since  1.0.0
-     * @access private
      */
-    function footer() {
+    protected function footer() {
         $footer = $this->footer_content;
         if ($footer) {
             if ($this->header_type == GESHI_HEADER_PRE) {
@@ -4233,12 +4177,11 @@ class GeSHi {
      * Replaces certain keywords in the header and footer with
      * certain configuration values
      *
-     * @param  string The header or footer content to do replacement on
+     * @param  string $instr The header or footer content to do replacement on
      * @return string The header or footer with replaced keywords
      * @since  1.0.2
-     * @access private
      */
-    function replace_keywords($instr) {
+    protected function replace_keywords($instr) {
         $keywords = $replacements = array();
 
         $keywords[] = '<TIME>';
@@ -4314,7 +4257,6 @@ class GeSHi {
      * @copyright   Copyright 2007, {@link http://wikkawiki.org/CreditsPage
      *              Wikka Development Team}
      *
-     * @access      private
      * @param       string  $string string to be converted
      * @param       integer $quote_style
      *                      - ENT_COMPAT:   escapes &, <, > and double quote (default)
@@ -4323,7 +4265,7 @@ class GeSHi {
      * @return      string  converted string
      * @since       1.0.7.18
      */
-    function hsc($string, $quote_style = ENT_COMPAT) {
+    protected function hsc($string, $quote_style = ENT_COMPAT) {
         // init
         static $aTransSpecchar = array(
             '&' => '&amp;',
@@ -4354,7 +4296,15 @@ class GeSHi {
         return strtr($string, $aTransSpecchar);
     }
 
-    function _genCSSName($name){
+    /**
+     * Generate a CSS class name from a given string.
+     * Prevents invalid CSS classes.
+     *
+     * @param string $name Proposed class name
+     *
+     * @return string Safe CSS class name
+     */
+    protected function _genCSSName($name) {
         return (is_numeric($name[0]) ? '_' : '') . $name;
     }
 
@@ -4363,11 +4313,11 @@ class GeSHi {
      * is true, we only return the stylesheet declarations that matter for
      * this code block instead of the whole thing
      *
-     * @param  boolean Whether to use economy mode or not
+     * @param  boolean $economy_mode Whether to use economy mode or not
      * @return string A stylesheet built on the data for the current language
      * @since  1.0.0
      */
-    function get_stylesheet($economy_mode = true) {
+    public function get_stylesheet($economy_mode = true) {
         // If there's an error, chances are that the language file
         // won't have populated the language data file, so we can't
         // risk getting a stylesheet...
@@ -4567,12 +4517,10 @@ class GeSHi {
     /**
      * Get's the style that is used for the specified line
      *
-     * @param int The line number information is requested for
-     * @access private
+     * @param int $line The line number information is requested for
      * @since 1.0.7.21
      */
-    function get_line_style($line) {
-        //$style = null;
+    protected function get_line_style($line) {
         $style = null;
         if (isset($this->highlight_extra_lines_styles[$line])) {
             $style = $this->highlight_extra_lines_styles[$line];
@@ -4591,14 +4539,13 @@ class GeSHi {
     * <code>$list = array('faa', 'foo', 'foobar');
     *          => string 'f(aa|oo(bar)?)'</code>
     *
-    * @param $list array of (unquoted) strings
-    * @param $regexp_delimiter your regular expression delimiter, @see preg_quote()
+    * @param array  $list             array of (unquoted) strings
+    * @param string $regexp_delimiter your regular expression delimiter, @see preg_quote()
     * @return string for regular expression
     * @author Milian Wolff <mail@milianw.de>
     * @since 1.0.8
-    * @access private
     */
-    function optimize_regexp_list($list, $regexp_delimiter = '/') {
+    protected function optimize_regexp_list($list, $regexp_delimiter = '/') {
         $regex_chars = array('.', '\\', '+', '-', '*', '?', '[', '^', ']', '$',
             '(', ')', '{', '}', '=', '!', '<', '>', '|', ':', $regexp_delimiter);
         sort($list);
@@ -4710,18 +4657,18 @@ class GeSHi {
         }
         return $regexp_list;
     }
+
     /**
     * this function creates the appropriate regexp string of an token array
     * you should not call this function directly, @see $this->optimize_regexp_list().
     *
-    * @param &$tokens array of tokens
-    * @param $recursed bool to know wether we recursed or not
+    * @param array $tokens   array of tokens
+    * @param bool  $recursed to know wether we recursed or not
     * @return string
     * @author Milian Wolff <mail@milianw.de>
     * @since 1.0.8
-    * @access private
     */
-    function _optimize_regexp_list_tokens_to_string(&$tokens, $recursed = false) {
+    protected function _optimize_regexp_list_tokens_to_string(&$tokens, $recursed = false) {
         $list = '';
         foreach ($tokens as $token => $sub_tokens) {
             $list .= $token;
@@ -4762,11 +4709,11 @@ if (!function_exists('geshi_highlight')) {
     /**
      * Easy way to highlight stuff. Behaves just like highlight_string
      *
-     * @param string The code to highlight
-     * @param string The language to highlight the code in
-     * @param string The path to the language files. You can leave this blank if you need
-     *               as from version 1.0.7 the path should be automatically detected
-     * @param boolean Whether to return the result or to echo
+     * @param string $string   The code to highlight
+     * @param string $language The language to highlight the code in
+     * @param string $path     The path to the language files. You can leave this blank if you need
+     *                         as from version 1.0.7 the path should be automatically detected
+     * @param boolean $return  Whether to return the result or to echo
      * @return string The code highlighted (if $return is true)
      * @since 1.0.2
      */
diff --git a/htdocs/application/libraries/geshi/geshi/4cs.php b/htdocs/application/libraries/geshi/geshi/4cs.php
index 8fdf931..cae453f 100644
--- a/htdocs/application/libraries/geshi/geshi/4cs.php
+++ b/htdocs/application/libraries/geshi/geshi/4cs.php
@@ -4,7 +4,7 @@
  * ------
  * Author: Jason Curl (jason.curl@continental-corporation.com)
  * Copyright: (c) 2009 Jason Curl
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/09/05
  *
  * 4CS language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/6502acme.php b/htdocs/application/libraries/geshi/geshi/6502acme.php
index 6b37a27..a11a108 100644
--- a/htdocs/application/libraries/geshi/geshi/6502acme.php
+++ b/htdocs/application/libraries/geshi/geshi/6502acme.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Warren Willmey
  * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/05/26
  *
  * MOS 6502 (more specifically 6510) ACME Cross Assembler 0.93 by Marco Baye language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/6502kickass.php b/htdocs/application/libraries/geshi/geshi/6502kickass.php
index 205cdd1..9da8f24 100644
--- a/htdocs/application/libraries/geshi/geshi/6502kickass.php
+++ b/htdocs/application/libraries/geshi/geshi/6502kickass.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Warren Willmey
  * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/06/07
  *
  * MOS 6502 (6510) Kick Assembler 3.13 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/6502tasm.php b/htdocs/application/libraries/geshi/geshi/6502tasm.php
index 4efe25e..4ce348f 100644
--- a/htdocs/application/libraries/geshi/geshi/6502tasm.php
+++ b/htdocs/application/libraries/geshi/geshi/6502tasm.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Warren Willmey
  * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/06/02
  *
  * MOS 6502 (6510) TASM/64TASS (64TASS being the super set of TASM) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/68000devpac.php b/htdocs/application/libraries/geshi/geshi/68000devpac.php
index 90aea4c..96a9d08 100644
--- a/htdocs/application/libraries/geshi/geshi/68000devpac.php
+++ b/htdocs/application/libraries/geshi/geshi/68000devpac.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Warren Willmey
  * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/06/09
  *
  * Motorola 68000 - HiSoft Devpac ST 2 Assembler language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/abap.php b/htdocs/application/libraries/geshi/geshi/abap.php
index faa5efc..d9df3ea 100644
--- a/htdocs/application/libraries/geshi/geshi/abap.php
+++ b/htdocs/application/libraries/geshi/geshi/abap.php
@@ -7,7 +7,7 @@
  *  - Sandra Rossi (sandra.rossi@gmail.com)
  *  - Jacob Laursen (jlu@kmd.dk)
  * Copyright: (c) 2007 Andres Picazo
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * ABAP language file for GeSHi.
@@ -1326,15 +1326,15 @@ $language_data = array(
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;', //control statements
-            2 => 'color: #cc4050; text-transform: uppercase; font-weight: bold; zzz:data;', //data statements
-            3 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;', //first token of other statements
-            4 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;', // next tokens of other statements ("keywords")
-            5 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
-            6 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
-            7 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
-            8 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
-            9 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;'
+            1 => 'color: #000066; font-weight: bold; zzz:control;', //control statements
+            2 => 'color: #cc4050; font-weight: bold; zzz:data;', //data statements
+            3 => 'color: #005066; font-weight: bold; zzz:statement;', //first token of other statements
+            4 => 'color: #500066; font-weight: bold; zzz:keyword;', // next tokens of other statements ("keywords")
+            5 => 'color: #005066; font-weight: bold; zzz:statement;',
+            6 => 'color: #000066; font-weight: bold; zzz:control;',
+            7 => 'color: #000066; font-weight: bold; zzz:control;',
+            8 => 'color: #005066; font-weight: bold; zzz:statement;',
+            9 => 'color: #500066; font-weight: bold; zzz:keyword;'
             ),
         'COMMENTS' => array(
             1 => 'color: #808080; font-style: italic;',
@@ -1368,9 +1368,9 @@ $language_data = array(
             )
         ),
     'URLS' => array(
-        1 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
-        2 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
-        3 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        1 => 'http://help.sap.com/abapdocu_740/en/ABAP{FNAMEU}.htm',
+        2 => 'http://help.sap.com/abapdocu_740/en/ABAP{FNAMEU}.htm',
+        3 => 'http://help.sap.com/abapdocu_740/en/ABAP{FNAMEU}.htm',
         4 => '',
         5 => '',
         6 => '',
diff --git a/htdocs/application/libraries/geshi/geshi/actionscript.php b/htdocs/application/libraries/geshi/geshi/actionscript.php
index e8521f2..bbafbdf 100644
--- a/htdocs/application/libraries/geshi/geshi/actionscript.php
+++ b/htdocs/application/libraries/geshi/geshi/actionscript.php
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Steffen Krause (Steffen.krause@muse.de)
  * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/20
  *
  * Actionscript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/actionscript3.php b/htdocs/application/libraries/geshi/geshi/actionscript3.php
index f8425f1..20dcf5d 100644
--- a/htdocs/application/libraries/geshi/geshi/actionscript3.php
+++ b/htdocs/application/libraries/geshi/geshi/actionscript3.php
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Jordi Boggiano (j.boggiano@seld.be)
  * Copyright: (c) 2007 Jordi Boggiano (http://www.seld.be/), Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/11/26
  *
  * ActionScript3 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ada.php b/htdocs/application/libraries/geshi/geshi/ada.php
index 3e48fd1..bad8595 100644
--- a/htdocs/application/libraries/geshi/geshi/ada.php
+++ b/htdocs/application/libraries/geshi/geshi/ada.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/29
  *
  * Ada language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/aimms.php b/htdocs/application/libraries/geshi/geshi/aimms.php
index f46bdd0..ea49b8e 100644
--- a/htdocs/application/libraries/geshi/geshi/aimms.php
+++ b/htdocs/application/libraries/geshi/geshi/aimms.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Guido Diepen (guido.diepen@aimms.com)
  * Copyright: (c) 2011 Guido Diepen (http://www.aimms.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/05/05
  *
  * AIMMS language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/algol68.php b/htdocs/application/libraries/geshi/geshi/algol68.php
index 2aadb0c..f1555c6 100644
--- a/htdocs/application/libraries/geshi/geshi/algol68.php
+++ b/htdocs/application/libraries/geshi/geshi/algol68.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Neville Dempsey (NevilleD.sourceforge@sgr-a.net)
  * Copyright: (c) 2010 Neville Dempsey (https://sourceforge.net/projects/algol68/files/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/04/24
  *
  * ALGOL 68 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/apache.php b/htdocs/application/libraries/geshi/geshi/apache.php
index 799f250..da1f5dd 100644
--- a/htdocs/application/libraries/geshi/geshi/apache.php
+++ b/htdocs/application/libraries/geshi/geshi/apache.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/29/07
  *
  * Apache language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/applescript.php b/htdocs/application/libraries/geshi/geshi/applescript.php
index fae9bb8..e71eb32 100644
--- a/htdocs/application/libraries/geshi/geshi/applescript.php
+++ b/htdocs/application/libraries/geshi/geshi/applescript.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Stephan Klimek (http://www.initware.org)
  * Copyright: Stephan Klimek (http://www.initware.org)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/07/20
  *
  * AppleScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/apt_sources.php b/htdocs/application/libraries/geshi/geshi/apt_sources.php
index f270ea3..49c51b0 100644
--- a/htdocs/application/libraries/geshi/geshi/apt_sources.php
+++ b/htdocs/application/libraries/geshi/geshi/apt_sources.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/06/17
  *
  * Apt sources.list language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/arm.php b/htdocs/application/libraries/geshi/geshi/arm.php
index dd2870c..86b71e1 100644
--- a/htdocs/application/libraries/geshi/geshi/arm.php
+++ b/htdocs/application/libraries/geshi/geshi/arm.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Marat Dukhan (mdukhan3.at.gatech.dot.edu)
  * Copyright: (c) Marat Dukhan (mdukhan3.at.gatech.dot.edu)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/10/06
  *
  * ARM Assembler language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/asm.php b/htdocs/application/libraries/geshi/geshi/asm.php
index b602830..606f2f4 100644
--- a/htdocs/application/libraries/geshi/geshi/asm.php
+++ b/htdocs/application/libraries/geshi/geshi/asm.php
@@ -8,7 +8,7 @@
  *                2009-2011 Benny Baumann (http://qbnz.com/highlighter),
  *                2011 Dennis Yurichev (dennis@conus.info),
  *                2011 Marat Dukhan (mdukhan3.at.gatech.dot.edu)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/27
  *
  * x86 Assembler language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/asp.php b/htdocs/application/libraries/geshi/geshi/asp.php
index c68ba07..6ba8f98 100644
--- a/htdocs/application/libraries/geshi/geshi/asp.php
+++ b/htdocs/application/libraries/geshi/geshi/asp.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Amit Gupta (http://blog.igeek.info/)
  * Copyright: (c) 2004 Amit Gupta (http://blog.igeek.info/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/13
  *
  * ASP language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/asymptote.php b/htdocs/application/libraries/geshi/geshi/asymptote.php
index 1c5c56a..a75a629 100644
--- a/htdocs/application/libraries/geshi/geshi/asymptote.php
+++ b/htdocs/application/libraries/geshi/geshi/asymptote.php
@@ -4,7 +4,7 @@
  * -------------
  * Author: Manuel Yguel (manuel.yguel.robotics@gmail.com)
  * Copyright: (c) 2012 Manuel Yguel (http://manuelyguel.eu)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/05/24
  *
  * asymptote language file for GeSHi.
@@ -46,7 +46,7 @@ $language_data = array(
         1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
         //Multiline-continued preprocessor define
         2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
-        ),
+    ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
     'ESCAPE_CHAR' => '',
@@ -61,67 +61,1730 @@ $language_data = array(
         4 => "#\\\\U[\da-fA-F]{8}#",
         //Octal Char Specs
         5 => "#\\\\[0-7]{1,3}#"
-        ),
+    ),
     'NUMBERS' =>
         GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
         GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
         GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
-            'and','controls','tension','atleast','curl','if','else','while','for','do','return','break','continue','struct','typedef','new','access','import','unravel','from','include','quote','static','public','private','restricted','this','explicit','true','false','null','cycle','newframe','operator'
-            ),
-        2 => array(
-            'Braid','FitResult','Label','Legend','Segment','Solution','TreeNode','abscissa','arc','arrowhead','binarytree','binarytreeNode','block','bool','bool3','bounds','bqe','circle','conic','coord','coordsys','cputime','ellipse','file','filltype','frame','grid3','guide','horner','hsv','hyperbola','indexedTransform','int','inversion','key','light','line','linefit','marginT','marker','mass','object','pair','parabola','path','path3','pen','picture','point','position','projection','real','revolution','scaleT','scientific','segment','side','slice','solution','splitface','string','surface','tensionSpecifier','ticklocate','ticksgridT','tickvalues','transform','transformation','tree','triangle','trilinear','triple','vector','vertex','void'),
-        3 => array(
-            'AND','Arc','ArcArrow','ArcArrows','Arrow','Arrows','Automatic','AvantGarde','BBox','BWRainbow','BWRainbow2','Bar','Bars','BeginArcArrow','BeginArrow','BeginBar','BeginDotMargin','BeginMargin','BeginPenMargin','Blank','Bookman','Bottom','BottomTop','Bounds','Break','Broken','BrokenLog','CLZ','CTZ','Ceil','Circle','CircleBarIntervalMarker','Cos','Courier','CrossIntervalMarker','DOSendl','DOSnewl','DefaultFormat','DefaultLogFormat','Degrees','Dir','DotMargin','DotMargins','Dotted','Draw','Drawline','Embed','EndArcArrow','EndArrow','EndBar','EndDotMargin','EndMargin','EndPenMargin','Fill','FillDraw','Floor','Format','Full','Gaussian','Gaussrand','Gaussrandpair',
-            'Gradient','Grayscale','Helvetica','Hermite','HookHead','InOutTicks','InTicks','Jn','Label','Landscape','Left','LeftRight','LeftTicks','Legend','Linear','Link','Log','LogFormat','Margin','Margins','Mark','MidArcArrow','MidArrow','NOT','NewCenturySchoolBook','NoBox','NoMargin','NoModifier','NoTicks','NoTicks3','NoZero','NoZeroFormat','None','OR','OmitFormat','OmitTick','OmitTickInterval','OmitTickIntervals','OutTicks','Ox','Oy','Palatino','PaletteTicks','Pen','PenMargin','PenMargins','Pentype','Portrait','RadialShade','RadialShadeDraw','Rainbow','Range','Relative','Right','RightTicks','Rotate','Round','SQR','Scale','ScaleX','ScaleY','ScaleZ','Seascape','Segment','Shift','Sin','Slant','Spline','StickIntervalMarker','Straight','Symbol','Tan','TeXify','Ticks','Ticks3','TildeIntervalMarker','TimesRoman','Top','TrueMargin','UnFill','UpsideDown','Wheel','X','XEquals','XOR','XY','XYEquals','XYZero','XYgrid','XZEquals','XZZero','XZero','XZgrid','Y','YEquals','YXgrid','YZ','YZEquals','YZZero','YZero','YZgrid','Yn','Z','ZX','ZXgrid','ZYgrid','ZapfChancery','ZapfDingbats','_begingroup3','_cputime','_draw','_eval','_image','_labelpath','_projection','_strokepath','_texpath','aCos','aSin','aTan','abort','abs','accel','acos','acosh','acot','acsc','activatequote','add',
-            'addArrow','addMargins','addSaveFunction','addpenarc','addpenline','adjust','alias','align','all','altitude','angabscissa','angle','angpoint','animate','annotate','anticomplementary','antipedal','apply','approximate','arc','arcarrowsize','arccircle','arcdir','arcfromcenter','arcfromfocus','arclength','arcnodesnumber','arcpoint','arcsubtended','arcsubtendedcenter','arctime','arctopath','array','arrow','arrow2','arrowbase','arrowbasepoints','arrowsize','asec','asin','asinh','ask','assert','asy','asycode','asydir','asyfigure','asyfilecode','asyinclude','asywrite','atan','atan2','atanh','atbreakpoint','atexit','attach','attract','atupdate','autoformat','autoscale','autoscale3','axes','axes3','axialshade','axis','axiscoverage','azimuth','babel','background','bangles','bar','barmarksize','barsize','basealign','baseline','bbox','beep','begin','beginclip','begingroup','beginpoint','between','bevel','bezier','bezierP','bezierPP','bezierPPP','bezulate','bibliography','bibliographystyle','binarytree','binarytreeNode','binomial','binput','bins','bisector','bisectorpoint','bispline','blend','blockconnector','boutput','box','bqe','breakpoint','breakpoints','brick','buildRestoreDefaults','buildRestoreThunk','buildcycle','bulletcolor','byte','calculateScaling','canonical','canonicalcartesiansystem','cartesiansystem','case1','case2','case3','case4','cbrt','cd','ceil','center','centerToFocus',
-            'centroid','cevian','change2','changecoordsys','checkSegment','checkconditionlength','checker','checkincreasing','checklengths','checkposition','checktriangle','choose','circle','circlebarframe','circlemarkradius','circlenodesnumber','circumcenter','circumcircle','clamped','clear','clip','clipdraw','close','cmyk','code','colatitude','collect','collinear','color','colorless','colors','colorspace','comma','compassmark','complement','complementary','concat','concurrent','cone','conic','conicnodesnumber','conictype','conj','connect','connected','connectedindex','containmentTree','contains','contour','contour3','contouredges','controlSpecifier','convert','coordinates','coordsys','copy','copyPairOrTriple','cos','cosh','cot','countIntersections','cputime','crop','cropcode','cross',
-            'crossframe','crosshatch','crossmarksize','csc','cubicroots','curabscissa','curlSpecifier','curpoint','currentarrow','currentexitfunction','currentmomarrow','currentpolarconicroutine','curve','cut','cutafter','cutbefore','cyclic','cylinder','deactivatequote','debugger','deconstruct','defaultdir','defaultformat','defaultpen','defined','degenerate','degrees','delete','deletepreamble','determinant','diagonal','diamond','diffdiv','dir','dirSpecifier','dirtime','display','distance',
-            'divisors','do_overpaint','dot','dotframe','dotsize','downcase','draw','drawAll','drawDoubleLine','drawFermion','drawGhost','drawGluon','drawMomArrow','drawPRCcylinder','drawPRCdisk','drawPRCsphere','drawPRCtube','drawPhoton','drawScalar','drawVertex','drawVertexBox','drawVertexBoxO','drawVertexBoxX','drawVertexO','drawVertexOX','drawVertexTriangle','drawVertexTriangleO','drawVertexX','drawarrow','drawarrow2','drawline','drawpixel','drawtick','duplicate','elle','ellipse','ellipsenodesnumber','embed','embed3','empty','enclose','end','endScript','endclip','endgroup','endgroup3','endl','endpoint','endpoints','eof','eol','equation','equations','erase','erasestep','erf','erfc','error','errorbar','errorbars','eval','excenter','excircle','exit','exitXasyMode','exitfunction','exp','expfactors','expi','expm1','exradius','extend','extension','extouch','fabs','factorial','fermat','fft','fhorner','figure','file','filecode','fill','filldraw','filloutside','fillrule','filltype','find','finite','finiteDifferenceJacobian','firstcut','firstframe','fit','fit2','fixedscaling','floor','flush','fmdefaults','fmod','focusToCenter','font','fontcommand','fontsize','foot','format','frac','frequency','fromCenter','fromFocus','fspline','functionshade','gamma','generate_random_backtrace','generateticks','gergonne','getc','getint','getpair','getreal','getstring','gettriple','gluon','gouraudshade','graph','graphic','gray','grestore','grid','grid3','gsave','halfbox','hatch','hdiffdiv','hermite','hex','histogram','history','hline','hprojection',
-            'hsv','hyperbola','hyperbolanodesnumber','hyperlink','hypot','identity','image','incenter','incentral','incircle','increasing','incrementposition','indexedTransform','indexedfigure','initXasyMode','initdefaults','input','inradius','insert','inside','integrate','interactive','interior','interp','interpolate','intersect','intersection','intersectionpoint','intersectionpoints','intersections','intouch','inverse','inversion','invisible','is3D','isCCW','isDuplicate','isogonal','isogonalconjugate','isotomic','isotomicconjugate','isparabola','italic','item','jobname','key','kurtosis','kurtosisexcess','label','labelaxis','labelmargin','labelpath','labels','labeltick','labelx','labelx3','labely','labely3','labelz','labelz3','lastcut','latex','latitude','latticeshade','layer','layout','ldexp','leastsquares','legend','legenditem','length','lexorder','lift','light','limits','line','linear','linecap','lineinversion','linejoin','linemargin','lineskip','linetype','linewidth','link','list','lm_enorm','lm_evaluate_default','lm_lmdif','lm_lmpar','lm_minimize','lm_print_default','lm_print_quiet','lm_qrfac','lm_qrsolv','locale','locate',
-            'locatefile','location','log','log10','log1p','logaxiscoverage','longitude','lookup','makeNode','makedraw','makepen','map','margin','markangle','markangleradius','markanglespace','markarc','marker','markinterval','marknodes','markrightangle','markuniform','mass','masscenter','massformat','math','max','max3','maxAfterTransform','maxbezier','maxbound','maxcoords','maxlength','maxratio','maxtimes','mean','medial','median','midpoint','min','min3','minAfterTransform','minbezier','minbound','minipage','minratio','mintimes','miterlimit','mktemp','momArrowPath','momarrowsize','monotonic','multifigure','nativeformat','natural','needshipout','newl','newpage','newslide','newton','newtree','nextframe','nextnormal','nextpage','nib','nodabscissa','none','norm','normalvideo','notaknot','nowarn','numberpage','nurb','object','offset','onpath','opacity','opposite','orientation','origin','orthic','orthocentercenter','outformat','outline','outname','outprefix','output','overloadedMessage','overwrite','pack','pad','pairs','palette','parabola','parabolanodesnumber','parallel','parallelogram','partialsum','path','path3','pattern','pause','pdf','pedal','periodic','perp','perpendicular','perpendicularmark','phantom','phi1','phi2','phi3','photon','piecewisestraight','point','polar','polarconicroutine','polargraph','polygon','postcontrol','postscript','pow10','ppoint','prc','prc0','precision','precontrol','prepend','printBytecode','print_random_addresses','project','projection','purge','pwhermite','quadrant','quadraticroots','quantize','quarticroots','quotient','radialshade','radians','radicalcenter','radicalline','radius','rand','randompath','rd','readline','realmult','realquarticroots','rectangle','rectangular','rectify','reflect','relabscissa','relative','relativedistance','reldir','relpoint','reltime','remainder','remark','removeDuplicates','rename','replace','report','resetdefaultpen','restore','restoredefaults','reverse','reversevideo','rf','rfind','rgb','rgba','rgbint','rms',
-            'rotate','rotateO','rotation','round','roundbox','roundedpath','roundrectangle','same','samecoordsys','sameside','sample','save','savedefaults','saveline','scale','scale3','scaleO','scaleT','scaleless','scientific','search','searchindex','searchtree','sec','secondaryX','secondaryY','seconds','section','sector','seek','seekeof','segment','sequence','setcontour','setpens','sgn','sgnd','sharpangle','sharpdegrees','shift','shiftless','shipout','shipout3','show','side','simeq','simpson','sin','sinh','size','size3','skewness','skip','slant','sleep','slope','slopefield','solve','solveBVP','sort','sourceline','sphere','split','sqrt','square','srand','standardizecoordsys','startScript','stdev','step','stickframe','stickmarksize','stickmarkspace','stop','straight','straightness','string','stripdirectory','stripextension','stripfile','stripsuffix','strokepath','subdivide','subitem','subpath','substr','sum','surface','symmedial','symmedian','system',
-            'tab','tableau','tan','tangent','tangential','tangents','tanh','tell','tensionSpecifier','tensorshade','tex','texcolor','texify','texpath','texpreamble','texreset','texshipout','texsize','textpath','thick','thin','tick','tickMax','tickMax3','tickMin','tickMin3','ticklabelshift','ticklocate','tildeframe','tildemarksize','tile','tiling','time','times','title','titlepage','topbox','transform','transformation','transpose','trembleFuzz','triangle','triangleAbc','triangleabc','triangulate','tricoef','tridiagonal','trilinear','trim','truepoint','tube','uncycle','unfill','uniform','unique','unit','unitrand','unitsize','unityroot','unstraighten','upcase','updatefunction','uperiodic','upscale','uptodate','usepackage','usersetting','usetypescript','usleep','value','variance','variancebiased','vbox','vector','vectorfield','verbatim','view','vline','vperiodic','vprojection','warn','warning','windingnumber','write','xaxis','xaxis3','xaxis3At','xaxisAt','xequals','xinput','xlimits','xoutput','xpart','xscale','xscaleO','xtick','xtick3','xtrans','yaxis','yaxis3','yaxis3At','yaxisAt','yequals','ylimits','ypart','yscale','yscaleO','ytick','ytick3','ytrans','zaxis3','zaxis3At','zero','zero3','zlimits','zpart','ztick','ztick3','ztrans'
-            ),
-        4 => array(
-            'AliceBlue','Align','Allow','AntiqueWhite','Apricot','Aqua','Aquamarine','Aspect','Azure','BeginPoint','Beige','Bisque','Bittersweet','Black','BlanchedAlmond','Blue','BlueGreen','BlueViolet','Both','Break','BrickRed','Brown','BurlyWood','BurntOrange','CCW','CW','CadetBlue','CarnationPink','Center','Centered','Cerulean','Chartreuse','Chocolate','Coeff','Coral','CornflowerBlue','Cornsilk','Crimson','Crop','Cyan','Dandelion','DarkBlue','DarkCyan','DarkGoldenrod','DarkGray','DarkGreen','DarkKhaki','DarkMagenta','DarkOliveGreen','DarkOrange','DarkOrchid','DarkRed','DarkSalmon','DarkSeaGreen','DarkSlateBlue','DarkSlateGray','DarkTurquoise','DarkViolet','DeepPink','DeepSkyBlue','DefaultHead','DimGray','DodgerBlue','Dotted','Down','Draw','E','ENE','EPS','ESE','E_Euler','E_PC','E_RK2','E_RK3BS','Emerald','EndPoint','Euler','Fill','FillDraw','FireBrick','FloralWhite','ForestGreen','Fuchsia','Gainsboro','GhostWhite','Gold','Goldenrod','Gray','Green','GreenYellow','Honeydew','HookHead','Horizontal','HotPink','I','IgnoreAspect','IndianRed','Indigo','Ivory','JOIN_IN','JOIN_OUT','JungleGreen','Khaki','LM_DWARF','LM_MACHEP','LM_SQRT_DWARF','LM_SQRT_GIANT','LM_USERTOL','Label','Lavender','LavenderBlush','LawnGreen','Left','LeftJustified','LeftSide','LemonChiffon','LightBlue','LightCoral','LightCyan','LightGoldenrodYellow',
-            'LightGreen','LightGrey','LightPink','LightSalmon','LightSeaGreen','LightSkyBlue','LightSlateGray','LightSteelBlue','LightYellow','Lime','LimeGreen','Linear','Linen','Log','Logarithmic','Magenta','Mahogany','Mark','MarkFill','Maroon','Max','MediumAquamarine','MediumBlue','MediumOrchid','MediumPurple','MediumSeaGreen','MediumSlateBlue','MediumSpringGreen','MediumTurquoise','MediumVioletRed','Melon','MidPoint','MidnightBlue','Min','MintCream','MistyRose','Moccasin','Move','MoveQuiet','Mulberry','N','NE','NNE','NNW','NW','NavajoWhite','Navy','NavyBlue','NoAlign','NoCrop','NoFill','NoSide','OldLace','Olive','OliveDrab','OliveGreen','Orange','OrangeRed','Orchid','Ox','Oy','PC','PaleGoldenrod','PaleGreen','PaleTurquoise','PaleVioletRed','PapayaWhip','Peach','PeachPuff','Periwinkle','Peru','PineGreen','Pink','Plum','PowderBlue','ProcessBlue','Purple','RK2','RK3','RK3BS','RK4','RK5','RK5DP','RK5F','RawSienna','Red','RedOrange','RedViolet','Rhodamine','Right','RightJustified','RightSide','RosyBrown','RoyalBlue','RoyalPurple','RubineRed','S','SE','SSE','SSW','SW','SaddleBrown','Salmon','SandyBrown','SeaGreen','Seashell','Sepia','Sienna','Silver','SimpleHead','SkyBlue','SlateBlue','SlateGray','Snow','SpringGreen','SteelBlue','Suppress','SuppressQuiet','Tan','TeXHead','Teal','TealBlue','Thistle','Ticksize','Tomato',
-            'Turquoise','UnFill','Up','VERSION','Value','Vertical','Violet','VioletRed','W','WNW','WSW','Wheat','White','WhiteSmoke','WildStrawberry','XYAlign','YAlign','Yellow','YellowGreen','YellowOrange','addpenarc','addpenline','align','allowstepping','angularsystem','animationdelay','appendsuffix','arcarrowangle','arcarrowfactor','arrow2sizelimit','arrowangle','arrowbarb','arrowdir','arrowfactor','arrowhookfactor','arrowlength','arrowsizelimit','arrowtexfactor','authorpen','axis','axiscoverage','axislabelfactor','background','backgroundcolor','backgroundpen','barfactor','barmarksizefactor','basealign','baselinetemplate','beveljoin','bigvertexpen','bigvertexsize','black','blue','bm','bottom','bp','brown','bullet','byfoci','byvertices','camerafactor','chartreuse','circlemarkradiusfactor','circlenodesnumberfactor','circleprecision','circlescale','cm','codefile','codepen','codeskip','colorPen','coloredNodes','coloredSegments',
-            'conditionlength','conicnodesfactor','count','cputimeformat','crossmarksizefactor','currentcoordsys','currentlight','currentpatterns','currentpen','currentpicture','currentposition','currentprojection','curvilinearsystem','cuttings','cyan','darkblue','darkbrown','darkcyan','darkgray','darkgreen','darkgrey','darkmagenta','darkolive','darkred','dashdotted','dashed','datepen','dateskip','debuggerlines','debugging','deepblue','deepcyan','deepgray','deepgreen','deepgrey','deepmagenta','deepred','default','defaultControl','defaultS','defaultbackpen','defaultcoordsys','defaultexcursion','defaultfilename','defaultformat','defaultmassformat','defaultpen','diagnostics','differentlengths','dot','dotfactor','dotframe','dotted','doublelinepen','doublelinespacing','down','duplicateFuzz','edge','ellipsenodesnumberfactor','eps','epsgeo','epsilon','evenodd','expansionfactor','extendcap','exterior','fermionpen','figureborder','figuremattpen','file3','firstnode','firststep','foregroundcolor','fuchsia','fuzz','gapfactor','ghostpen','gluonamplitude','gluonpen','gluonratio','gray','green','grey','hatchepsilon','havepagenumber','heavyblue','heavycyan','heavygray','heavygreen','heavygrey','heavymagenta','heavyred','hline','hwratio','hyperbola','hyperbolanodesnumberfactor','identity4','ignore','inXasyMode','inch','inches','includegraphicscommand','inf','infinity','institutionpen','intMax','intMin','interior','invert','invisible','itempen','itemskip','itemstep','labelmargin','landscape','lastnode','left','legendhskip','legendlinelength',
-            'legendmargin','legendmarkersize','legendmaxrelativewidth','legendvskip','lightblue','lightcyan','lightgray','lightgreen','lightgrey','lightmagenta','lightolive','lightred','lightyellow','line','linemargin','lm_infmsg','lm_shortmsg','longdashdotted','longdashed','magenta','magneticRadius','mantissaBits','markangleradius','markangleradiusfactor','markanglespace','markanglespacefactor','mediumblue','mediumcyan','mediumgray','mediumgreen','mediumgrey','mediummagenta','mediumred','mediumyellow','middle','minDistDefault','minblockheight','minblockwidth','mincirclediameter','minipagemargin','minipagewidth','minvertexangle','miterjoin','mm','momarrowfactor','momarrowlength','momarrowmargin','momarrowoffset','momarrowpen','monoPen','morepoints','nCircle','newbulletcolor','ngraph','nil','nmesh','nobasealign','nodeMarginDefault','nodesystem','nomarker','nopoint','noprimary','nullpath','nullpen','numarray','ocgindex','oldbulletcolor','olive','orange','origin','overpaint','page','pageheight','pagemargin','pagenumberalign','pagenumberpen','pagenumberposition','pagewidth','paleblue','palecyan','palegray','palegreen','palegrey',
-            'palemagenta','palered','paleyellow','parabolanodesnumberfactor','perpfactor','phi','photonamplitude','photonpen','photonratio','pi','pink','plain','plain_bounds','plain_scaling','plus','preamblenodes','pt','purple','r3','r4a','r4b','randMax','realDigits','realEpsilon','realMax','realMin','red','relativesystem','reverse','right','roundcap','roundjoin','royalblue','salmon','saveFunctions','scalarpen','sequencereal','settings','shipped','signedtrailingzero','solid','springgreen','sqrtEpsilon','squarecap','squarepen','startposition','stdin','stdout','stepfactor','stepfraction','steppagenumberpen','stepping','stickframe','stickmarksizefactor','stickmarkspacefactor','swap','textpen','ticksize','tildeframe','tildemarksizefactor','tinv','titlealign','titlepagepen','titlepageposition','titlepen','titleskip','top','trailingzero','treeLevelStep','treeMinNodeWidth','treeNodeStep','trembleAngle','trembleFrequency','trembleRandom','undefined','unitcircle','unitsquare','up','urlpen','urlskip','version','vertexpen','vertexsize','viewportmargin','viewportsize','vline','white','wye','xformStack','yellow','ylabelwidth','zerotickfuzz','zerowinding'
-            )
+            'and',
+            'controls',
+            'tension',
+            'atleast',
+            'curl',
+            'if',
+            'else',
+            'while',
+            'for',
+            'do',
+            'return',
+            'break',
+            'continue',
+            'struct',
+            'typedef',
+            'new',
+            'access',
+            'import',
+            'unravel',
+            'from',
+            'include',
+            'quote',
+            'static',
+            'public',
+            'private',
+            'restricted',
+            'this',
+            'explicit',
+            'true',
+            'false',
+            'null',
+            'cycle',
+            'newframe',
+            'operator'
         ),
+        2 => array(
+            'Braid',
+            'FitResult',
+            'Label',
+            'Legend',
+            'Segment',
+            'Solution',
+            'TreeNode',
+            'abscissa',
+            'arrowhead',
+            'binarytree',
+            'binarytreeNode',
+            'block',
+            'bool',
+            'bool3',
+            'bounds',
+            'bqe',
+            'circle',
+            'conic',
+            'coord',
+            'coordsys',
+            'cputime',
+            'ellipse',
+            'file',
+            'filltype',
+            'frame',
+            'grid3',
+            'guide',
+            'horner',
+            'hsv',
+            'hyperbola',
+            'indexedTransform',
+            'int',
+            'inversion',
+            'key',
+            'light',
+            'line',
+            'linefit',
+            'marginT',
+            'marker',
+            'mass',
+            'object',
+            'pair',
+            'parabola',
+            'path',
+            'path3',
+            'pen',
+            'picture',
+            'point',
+            'position',
+            'projection',
+            'real',
+            'revolution',
+            'scaleT',
+            'scientific',
+            'segment',
+            'side',
+            'slice',
+            'solution',
+            'splitface',
+            'string',
+            'surface',
+            'tensionSpecifier',
+            'ticklocate',
+            'ticksgridT',
+            'tickvalues',
+            'transform',
+            'transformation',
+            'tree',
+            'triangle',
+            'trilinear',
+            'triple',
+            'vector',
+            'vertex',
+            'void'),
+
+        3 => array(
+            'AND',
+            'Arc',
+            'ArcArrow',
+            'ArcArrows',
+            'Arrow',
+            'Arrows',
+            'Automatic',
+            'AvantGarde',
+            'BBox',
+            'BWRainbow',
+            'BWRainbow2',
+            'Bar',
+            'Bars',
+            'BeginArcArrow',
+            'BeginArrow',
+            'BeginBar',
+            'BeginDotMargin',
+            'BeginMargin',
+            'BeginPenMargin',
+            'Blank',
+            'Bookman',
+            'Bottom',
+            'BottomTop',
+            'Bounds',
+            'Break',
+            'Broken',
+            'BrokenLog',
+            'CLZ',
+            'CTZ',
+            'Ceil',
+            'Circle',
+            'CircleBarIntervalMarker',
+            'Cos',
+            'Courier',
+            'CrossIntervalMarker',
+            'DOSendl',
+            'DOSnewl',
+            'DefaultFormat',
+            'DefaultLogFormat',
+            'Degrees',
+            'Dir',
+            'DotMargin',
+            'DotMargins',
+            'Dotted',
+            'Draw',
+            'Drawline',
+            'Embed',
+            'EndArcArrow',
+            'EndArrow',
+            'EndBar',
+            'EndDotMargin',
+            'EndMargin',
+            'EndPenMargin',
+            'Fill',
+            'FillDraw',
+            'Floor',
+            'Format',
+            'Full',
+            'Gaussian',
+            'Gaussrand',
+            'Gaussrandpair',
+            'Gradient',
+            'Grayscale',
+            'Helvetica',
+            'Hermite',
+            'HookHead',
+            'InOutTicks',
+            'InTicks',
+            'Jn',
+            'Landscape',
+            'Left',
+            'LeftRight',
+            'LeftTicks',
+            'Linear',
+            'Link',
+            'Log',
+            'LogFormat',
+            'Margin',
+            'Margins',
+            'Mark',
+            'MidArcArrow',
+            'MidArrow',
+            'NOT',
+            'NewCenturySchoolBook',
+            'NoBox',
+            'NoMargin',
+            'NoModifier',
+            'NoTicks',
+            'NoTicks3',
+            'NoZero',
+            'NoZeroFormat',
+            'None',
+            'OR',
+            'OmitFormat',
+            'OmitTick',
+            'OmitTickInterval',
+            'OmitTickIntervals',
+            'OutTicks',
+            'Ox',
+            'Oy',
+            'Palatino',
+            'PaletteTicks',
+            'Pen',
+            'PenMargin',
+            'PenMargins',
+            'Pentype',
+            'Portrait',
+            'RadialShade',
+            'RadialShadeDraw',
+            'Rainbow',
+            'Range',
+            'Relative',
+            'Right',
+            'RightTicks',
+            'Rotate',
+            'Round',
+            'SQR',
+            'Scale',
+            'ScaleX',
+            'ScaleY',
+            'ScaleZ',
+            'Seascape',
+            'Shift',
+            'Sin',
+            'Slant',
+            'Spline',
+            'StickIntervalMarker',
+            'Straight',
+            'Symbol',
+            'Tan',
+            'TeXify',
+            'Ticks',
+            'Ticks3',
+            'TildeIntervalMarker',
+            'TimesRoman',
+            'Top',
+            'TrueMargin',
+            'UnFill',
+            'UpsideDown',
+            'Wheel',
+            'X',
+            'XEquals',
+            'XOR',
+            'XY',
+            'XYEquals',
+            'XYZero',
+            'XYgrid',
+            'XZEquals',
+            'XZZero',
+            'XZero',
+            'XZgrid',
+            'Y',
+            'YEquals',
+            'YXgrid',
+            'YZ',
+            'YZEquals',
+            'YZZero',
+            'YZero',
+            'YZgrid',
+            'Yn',
+            'Z',
+            'ZX',
+            'ZXgrid',
+            'ZYgrid',
+            'ZapfChancery',
+            'ZapfDingbats',
+            '_begingroup3',
+            '_cputime',
+            '_draw',
+            '_eval',
+            '_image',
+            '_labelpath',
+            '_projection',
+            '_strokepath',
+            '_texpath',
+            'aCos',
+            'aSin',
+            'aTan',
+            'abort',
+            'abs',
+            'accel',
+            'acos',
+            'acosh',
+            'acot',
+            'acsc',
+            'activatequote',
+            'add',
+            'addArrow',
+            'addMargins',
+            'addSaveFunction',
+            'addpenarc',
+            'addpenline',
+            'adjust',
+            'alias',
+            'align',
+            'all',
+            'altitude',
+            'angabscissa',
+            'angle',
+            'angpoint',
+            'animate',
+            'annotate',
+            'anticomplementary',
+            'antipedal',
+            'apply',
+            'approximate',
+            'arc',
+            'arcarrowsize',
+            'arccircle',
+            'arcdir',
+            'arcfromcenter',
+            'arcfromfocus',
+            'arclength',
+            'arcnodesnumber',
+            'arcpoint',
+            'arcsubtended',
+            'arcsubtendedcenter',
+            'arctime',
+            'arctopath',
+            'array',
+            'arrow',
+            'arrow2',
+            'arrowbase',
+            'arrowbasepoints',
+            'arrowsize',
+            'asec',
+            'asin',
+            'asinh',
+            'ask',
+            'assert',
+            'asy',
+            'asycode',
+            'asydir',
+            'asyfigure',
+            'asyfilecode',
+            'asyinclude',
+            'asywrite',
+            'atan',
+            'atan2',
+            'atanh',
+            'atbreakpoint',
+            'atexit',
+            'attach',
+            'attract',
+            'atupdate',
+            'autoformat',
+            'autoscale',
+            'autoscale3',
+            'axes',
+            'axes3',
+            'axialshade',
+            'axis',
+            'axiscoverage',
+            'azimuth',
+            'babel',
+            'bangles',
+            'bar',
+            'barmarksize',
+            'barsize',
+            'baseline',
+            'bbox',
+            'beep',
+            'begin',
+            'beginclip',
+            'begingroup',
+            'beginpoint',
+            'between',
+            'bevel',
+            'bezier',
+            'bezierP',
+            'bezierPP',
+            'bezierPPP',
+            'bezulate',
+            'bibliography',
+            'bibliographystyle',
+            'binomial',
+            'binput',
+            'bins',
+            'bisector',
+            'bisectorpoint',
+            'bispline',
+            'blend',
+            'blockconnector',
+            'boutput',
+            'box',
+            'breakpoint',
+            'breakpoints',
+            'brick',
+            'buildRestoreDefaults',
+            'buildRestoreThunk',
+            'buildcycle',
+            'bulletcolor',
+            'byte',
+            'calculateScaling',
+            'canonical',
+            'canonicalcartesiansystem',
+            'cartesiansystem',
+            'case1',
+            'case2',
+            'case3',
+            'case4',
+            'cbrt',
+            'cd',
+            'ceil',
+            'center',
+            'centerToFocus',
+            'centroid',
+            'cevian',
+            'change2',
+            'changecoordsys',
+            'checkSegment',
+            'checkconditionlength',
+            'checker',
+            'checkincreasing',
+            'checklengths',
+            'checkposition',
+            'checktriangle',
+            'choose',
+            'circlebarframe',
+            'circlemarkradius',
+            'circlenodesnumber',
+            'circumcenter',
+            'circumcircle',
+            'clamped',
+            'clear',
+            'clip',
+            'clipdraw',
+            'close',
+            'cmyk',
+            'code',
+            'colatitude',
+            'collect',
+            'collinear',
+            'color',
+            'colorless',
+            'colors',
+            'colorspace',
+            'comma',
+            'compassmark',
+            'complement',
+            'complementary',
+            'concat',
+            'concurrent',
+            'cone',
+            'conicnodesnumber',
+            'conictype',
+            'conj',
+            'connect',
+            'connected',
+            'connectedindex',
+            'containmentTree',
+            'contains',
+            'contour',
+            'contour3',
+            'contouredges',
+            'controlSpecifier',
+            'convert',
+            'coordinates',
+            'copy',
+            'copyPairOrTriple',
+            'cos',
+            'cosh',
+            'cot',
+            'countIntersections',
+            'crop',
+            'cropcode',
+            'cross',
+            'crossframe',
+            'crosshatch',
+            'crossmarksize',
+            'csc',
+            'cubicroots',
+            'curabscissa',
+            'curlSpecifier',
+            'curpoint',
+            'currentarrow',
+            'currentexitfunction',
+            'currentmomarrow',
+            'currentpolarconicroutine',
+            'curve',
+            'cut',
+            'cutafter',
+            'cutbefore',
+            'cyclic',
+            'cylinder',
+            'deactivatequote',
+            'debugger',
+            'deconstruct',
+            'defaultdir',
+            'defined',
+            'degenerate',
+            'degrees',
+            'delete',
+            'deletepreamble',
+            'determinant',
+            'diagonal',
+            'diamond',
+            'diffdiv',
+            'dir',
+            'dirSpecifier',
+            'dirtime',
+            'display',
+            'distance',
+            'divisors',
+            'do_overpaint',
+            'dotsize',
+            'downcase',
+            'draw',
+            'drawAll',
+            'drawDoubleLine',
+            'drawFermion',
+            'drawGhost',
+            'drawGluon',
+            'drawMomArrow',
+            'drawPRCcylinder',
+            'drawPRCdisk',
+            'drawPRCsphere',
+            'drawPRCtube',
+            'drawPhoton',
+            'drawScalar',
+            'drawVertex',
+            'drawVertexBox',
+            'drawVertexBoxO',
+            'drawVertexBoxX',
+            'drawVertexO',
+            'drawVertexOX',
+            'drawVertexTriangle',
+            'drawVertexTriangleO',
+            'drawVertexX',
+            'drawarrow',
+            'drawarrow2',
+            'drawline',
+            'drawpixel',
+            'drawtick',
+            'duplicate',
+            'elle',
+            'ellipsenodesnumber',
+            'embed',
+            'embed3',
+            'empty',
+            'enclose',
+            'end',
+            'endScript',
+            'endclip',
+            'endgroup',
+            'endgroup3',
+            'endl',
+            'endpoint',
+            'endpoints',
+            'eof',
+            'eol',
+            'equation',
+            'equations',
+            'erase',
+            'erasestep',
+            'erf',
+            'erfc',
+            'error',
+            'errorbar',
+            'errorbars',
+            'eval',
+            'excenter',
+            'excircle',
+            'exit',
+            'exitXasyMode',
+            'exitfunction',
+            'exp',
+            'expfactors',
+            'expi',
+            'expm1',
+            'exradius',
+            'extend',
+            'extension',
+            'extouch',
+            'fabs',
+            'factorial',
+            'fermat',
+            'fft',
+            'fhorner',
+            'figure',
+            'filecode',
+            'fill',
+            'filldraw',
+            'filloutside',
+            'fillrule',
+            'find',
+            'finite',
+            'finiteDifferenceJacobian',
+            'firstcut',
+            'firstframe',
+            'fit',
+            'fit2',
+            'fixedscaling',
+            'floor',
+            'flush',
+            'fmdefaults',
+            'fmod',
+            'focusToCenter',
+            'font',
+            'fontcommand',
+            'fontsize',
+            'foot',
+            'format',
+            'frac',
+            'frequency',
+            'fromCenter',
+            'fromFocus',
+            'fspline',
+            'functionshade',
+            'gamma',
+            'generate_random_backtrace',
+            'generateticks',
+            'gergonne',
+            'getc',
+            'getint',
+            'getpair',
+            'getreal',
+            'getstring',
+            'gettriple',
+            'gluon',
+            'gouraudshade',
+            'graph',
+            'graphic',
+            'gray',
+            'grestore',
+            'grid',
+            'gsave',
+            'halfbox',
+            'hatch',
+            'hdiffdiv',
+            'hermite',
+            'hex',
+            'histogram',
+            'history',
+            'hline',
+            'hprojection',
+            'hyperbolanodesnumber',
+            'hyperlink',
+            'hypot',
+            'identity',
+            'image',
+            'incenter',
+            'incentral',
+            'incircle',
+            'increasing',
+            'incrementposition',
+            'indexedfigure',
+            'initXasyMode',
+            'initdefaults',
+            'input',
+            'inradius',
+            'insert',
+            'inside',
+            'integrate',
+            'interactive',
+            'interior',
+            'interp',
+            'interpolate',
+            'intersect',
+            'intersection',
+            'intersectionpoint',
+            'intersectionpoints',
+            'intersections',
+            'intouch',
+            'inverse',
+            'invisible',
+            'is3D',
+            'isCCW',
+            'isDuplicate',
+            'isogonal',
+            'isogonalconjugate',
+            'isotomic',
+            'isotomicconjugate',
+            'isparabola',
+            'italic',
+            'item',
+            'jobname',
+            'kurtosis',
+            'kurtosisexcess',
+            'label',
+            'labelaxis',
+            'labelmargin',
+            'labelpath',
+            'labels',
+            'labeltick',
+            'labelx',
+            'labelx3',
+            'labely',
+            'labely3',
+            'labelz',
+            'labelz3',
+            'lastcut',
+            'latex',
+            'latitude',
+            'latticeshade',
+            'layer',
+            'layout',
+            'ldexp',
+            'leastsquares',
+            'legend',
+            'legenditem',
+            'length',
+            'lexorder',
+            'lift',
+            'limits',
+            'linear',
+            'linecap',
+            'lineinversion',
+            'linejoin',
+            'linemargin',
+            'lineskip',
+            'linetype',
+            'linewidth',
+            'link',
+            'list',
+            'lm_enorm',
+            'lm_evaluate_default',
+            'lm_lmdif',
+            'lm_lmpar',
+            'lm_minimize',
+            'lm_print_default',
+            'lm_print_quiet',
+            'lm_qrfac',
+            'lm_qrsolv',
+            'locale',
+            'locate',
+            'locatefile',
+            'location',
+            'log',
+            'log10',
+            'log1p',
+            'logaxiscoverage',
+            'longitude',
+            'lookup',
+            'makeNode',
+            'makedraw',
+            'makepen',
+            'map',
+            'margin',
+            'markangle',
+            'markarc',
+            'markinterval',
+            'marknodes',
+            'markrightangle',
+            'markuniform',
+            'masscenter',
+            'massformat',
+            'math',
+            'max',
+            'max3',
+            'maxAfterTransform',
+            'maxbezier',
+            'maxbound',
+            'maxcoords',
+            'maxlength',
+            'maxratio',
+            'maxtimes',
+            'mean',
+            'medial',
+            'median',
+            'midpoint',
+            'min',
+            'min3',
+            'minAfterTransform',
+            'minbezier',
+            'minbound',
+            'minipage',
+            'minratio',
+            'mintimes',
+            'miterlimit',
+            'mktemp',
+            'momArrowPath',
+            'momarrowsize',
+            'monotonic',
+            'multifigure',
+            'nativeformat',
+            'natural',
+            'needshipout',
+            'newl',
+            'newpage',
+            'newslide',
+            'newton',
+            'newtree',
+            'nextframe',
+            'nextnormal',
+            'nextpage',
+            'nib',
+            'nodabscissa',
+            'none',
+            'norm',
+            'normalvideo',
+            'notaknot',
+            'nowarn',
+            'numberpage',
+            'nurb',
+            'offset',
+            'onpath',
+            'opacity',
+            'opposite',
+            'orientation',
+            'origin',
+            'orthic',
+            'orthocentercenter',
+            'outformat',
+            'outline',
+            'outname',
+            'outprefix',
+            'output',
+            'overloadedMessage',
+            'overwrite',
+            'pack',
+            'pad',
+            'pairs',
+            'palette',
+            'parabolanodesnumber',
+            'parallel',
+            'parallelogram',
+            'partialsum',
+            'pattern',
+            'pause',
+            'pdf',
+            'pedal',
+            'periodic',
+            'perp',
+            'perpendicular',
+            'perpendicularmark',
+            'phantom',
+            'phi1',
+            'phi2',
+            'phi3',
+            'photon',
+            'piecewisestraight',
+            'polar',
+            'polarconicroutine',
+            'polargraph',
+            'polygon',
+            'postcontrol',
+            'postscript',
+            'pow10',
+            'ppoint',
+            'prc',
+            'prc0',
+            'precision',
+            'precontrol',
+            'prepend',
+            'printBytecode',
+            'print_random_addresses',
+            'project',
+            'purge',
+            'pwhermite',
+            'quadrant',
+            'quadraticroots',
+            'quantize',
+            'quarticroots',
+            'quotient',
+            'radialshade',
+            'radians',
+            'radicalcenter',
+            'radicalline',
+            'radius',
+            'rand',
+            'randompath',
+            'rd',
+            'readline',
+            'realmult',
+            'realquarticroots',
+            'rectangle',
+            'rectangular',
+            'rectify',
+            'reflect',
+            'relabscissa',
+            'relative',
+            'relativedistance',
+            'reldir',
+            'relpoint',
+            'reltime',
+            'remainder',
+            'remark',
+            'removeDuplicates',
+            'rename',
+            'replace',
+            'report',
+            'resetdefaultpen',
+            'restore',
+            'restoredefaults',
+            'reverse',
+            'reversevideo',
+            'rf',
+            'rfind',
+            'rgb',
+            'rgba',
+            'rgbint',
+            'rms',
+            'rotate',
+            'rotateO',
+            'rotation',
+            'round',
+            'roundbox',
+            'roundedpath',
+            'roundrectangle',
+            'same',
+            'samecoordsys',
+            'sameside',
+            'sample',
+            'save',
+            'savedefaults',
+            'saveline',
+            'scale',
+            'scale3',
+            'scaleO',
+            'scaleless',
+            'search',
+            'searchindex',
+            'searchtree',
+            'sec',
+            'secondaryX',
+            'secondaryY',
+            'seconds',
+            'section',
+            'sector',
+            'seek',
+            'seekeof',
+            'sequence',
+            'setcontour',
+            'setpens',
+            'sgn',
+            'sgnd',
+            'sharpangle',
+            'sharpdegrees',
+            'shift',
+            'shiftless',
+            'shipout',
+            'shipout3',
+            'show',
+            'simeq',
+            'simpson',
+            'sin',
+            'sinh',
+            'size',
+            'size3',
+            'skewness',
+            'skip',
+            'slant',
+            'sleep',
+            'slope',
+            'slopefield',
+            'solve',
+            'solveBVP',
+            'sort',
+            'sourceline',
+            'sphere',
+            'split',
+            'sqrt',
+            'square',
+            'srand',
+            'standardizecoordsys',
+            'startScript',
+            'stdev',
+            'step',
+            'stickframe',
+            'stickmarksize',
+            'stickmarkspace',
+            'stop',
+            'straight',
+            'straightness',
+            'stripdirectory',
+            'stripextension',
+            'stripfile',
+            'stripsuffix',
+            'strokepath',
+            'subdivide',
+            'subitem',
+            'subpath',
+            'substr',
+            'sum',
+            'symmedial',
+            'symmedian',
+            'system',
+            'tab',
+            'tableau',
+            'tan',
+            'tangent',
+            'tangential',
+            'tangents',
+            'tanh',
+            'tell',
+            'tensorshade',
+            'tex',
+            'texcolor',
+            'texify',
+            'texpath',
+            'texpreamble',
+            'texreset',
+            'texshipout',
+            'texsize',
+            'textpath',
+            'thick',
+            'thin',
+            'tick',
+            'tickMax',
+            'tickMax3',
+            'tickMin',
+            'tickMin3',
+            'ticklabelshift',
+            'tildeframe',
+            'tildemarksize',
+            'tile',
+            'tiling',
+            'time',
+            'times',
+            'title',
+            'titlepage',
+            'topbox',
+            'transpose',
+            'trembleFuzz',
+            'triangleAbc',
+            'triangleabc',
+            'triangulate',
+            'tricoef',
+            'tridiagonal',
+            'trim',
+            'truepoint',
+            'tube',
+            'uncycle',
+            'unfill',
+            'uniform',
+            'unique',
+            'unit',
+            'unitrand',
+            'unitsize',
+            'unityroot',
+            'unstraighten',
+            'upcase',
+            'updatefunction',
+            'uperiodic',
+            'upscale',
+            'uptodate',
+            'usepackage',
+            'usersetting',
+            'usetypescript',
+            'usleep',
+            'value',
+            'variance',
+            'variancebiased',
+            'vbox',
+            'vectorfield',
+            'verbatim',
+            'view',
+            'vperiodic',
+            'vprojection',
+            'warn',
+            'warning',
+            'windingnumber',
+            'write',
+            'xaxis',
+            'xaxis3',
+            'xaxis3At',
+            'xaxisAt',
+            'xequals',
+            'xinput',
+            'xlimits',
+            'xoutput',
+            'xpart',
+            'xscale',
+            'xscaleO',
+            'xtick',
+            'xtick3',
+            'xtrans',
+            'yaxis',
+            'yaxis3',
+            'yaxis3At',
+            'yaxisAt',
+            'yequals',
+            'ylimits',
+            'ypart',
+            'yscale',
+            'yscaleO',
+            'ytick',
+            'ytick3',
+            'ytrans',
+            'zaxis3',
+            'zaxis3At',
+            'zero',
+            'zero3',
+            'zlimits',
+            'zpart',
+            'ztick',
+            'ztick3',
+            'ztrans'
+        ),
+
+        4 => array(
+            'AliceBlue',
+            'Align',
+            'Allow',
+            'AntiqueWhite',
+            'Apricot',
+            'Aqua',
+            'Aquamarine',
+            'Aspect',
+            'Azure',
+            'BeginPoint',
+            'Beige',
+            'Bisque',
+            'Bittersweet',
+            'Black',
+            'BlanchedAlmond',
+            'Blue',
+            'BlueGreen',
+            'BlueViolet',
+            'Both',
+            'BrickRed',
+            'Brown',
+            'BurlyWood',
+            'BurntOrange',
+            'CCW',
+            'CW',
+            'CadetBlue',
+            'CarnationPink',
+            'Center',
+            'Centered',
+            'Cerulean',
+            'Chartreuse',
+            'Chocolate',
+            'Coeff',
+            'Coral',
+            'CornflowerBlue',
+            'Cornsilk',
+            'Crimson',
+            'Crop',
+            'Cyan',
+            'Dandelion',
+            'DarkBlue',
+            'DarkCyan',
+            'DarkGoldenrod',
+            'DarkGray',
+            'DarkGreen',
+            'DarkKhaki',
+            'DarkMagenta',
+            'DarkOliveGreen',
+            'DarkOrange',
+            'DarkOrchid',
+            'DarkRed',
+            'DarkSalmon',
+            'DarkSeaGreen',
+            'DarkSlateBlue',
+            'DarkSlateGray',
+            'DarkTurquoise',
+            'DarkViolet',
+            'DeepPink',
+            'DeepSkyBlue',
+            'DefaultHead',
+            'DimGray',
+            'DodgerBlue',
+            'Down',
+            'E',
+            'ENE',
+            'EPS',
+            'ESE',
+            'E_Euler',
+            'E_PC',
+            'E_RK2',
+            'E_RK3BS',
+            'Emerald',
+            'EndPoint',
+            'Euler',
+            'FireBrick',
+            'FloralWhite',
+            'ForestGreen',
+            'Fuchsia',
+            'Gainsboro',
+            'GhostWhite',
+            'Gold',
+            'Goldenrod',
+            'Gray',
+            'Green',
+            'GreenYellow',
+            'Honeydew',
+            'Horizontal',
+            'HotPink',
+            'I',
+            'IgnoreAspect',
+            'IndianRed',
+            'Indigo',
+            'Ivory',
+            'JOIN_IN',
+            'JOIN_OUT',
+            'JungleGreen',
+            'Khaki',
+            'LM_DWARF',
+            'LM_MACHEP',
+            'LM_SQRT_DWARF',
+            'LM_SQRT_GIANT',
+            'LM_USERTOL',
+            'Lavender',
+            'LavenderBlush',
+            'LawnGreen',
+            'LeftJustified',
+            'LeftSide',
+            'LemonChiffon',
+            'LightBlue',
+            'LightCoral',
+            'LightCyan',
+            'LightGoldenrodYellow',
+            'LightGreen',
+            'LightGrey',
+            'LightPink',
+            'LightSalmon',
+            'LightSeaGreen',
+            'LightSkyBlue',
+            'LightSlateGray',
+            'LightSteelBlue',
+            'LightYellow',
+            'Lime',
+            'LimeGreen',
+            'Linen',
+            'Logarithmic',
+            'Magenta',
+            'Mahogany',
+            'MarkFill',
+            'Maroon',
+            'Max',
+            'MediumAquamarine',
+            'MediumBlue',
+            'MediumOrchid',
+            'MediumPurple',
+            'MediumSeaGreen',
+            'MediumSlateBlue',
+            'MediumSpringGreen',
+            'MediumTurquoise',
+            'MediumVioletRed',
+            'Melon',
+            'MidPoint',
+            'MidnightBlue',
+            'Min',
+            'MintCream',
+            'MistyRose',
+            'Moccasin',
+            'Move',
+            'MoveQuiet',
+            'Mulberry',
+            'N',
+            'NE',
+            'NNE',
+            'NNW',
+            'NW',
+            'NavajoWhite',
+            'Navy',
+            'NavyBlue',
+            'NoAlign',
+            'NoCrop',
+            'NoFill',
+            'NoSide',
+            'OldLace',
+            'Olive',
+            'OliveDrab',
+            'OliveGreen',
+            'Orange',
+            'OrangeRed',
+            'Orchid',
+            'PC',
+            'PaleGoldenrod',
+            'PaleGreen',
+            'PaleTurquoise',
+            'PaleVioletRed',
+            'PapayaWhip',
+            'Peach',
+            'PeachPuff',
+            'Periwinkle',
+            'Peru',
+            'PineGreen',
+            'Pink',
+            'Plum',
+            'PowderBlue',
+            'ProcessBlue',
+            'Purple',
+            'RK2',
+            'RK3',
+            'RK3BS',
+            'RK4',
+            'RK5',
+            'RK5DP',
+            'RK5F',
+            'RawSienna',
+            'Red',
+            'RedOrange',
+            'RedViolet',
+            'Rhodamine',
+            'RightJustified',
+            'RightSide',
+            'RosyBrown',
+            'RoyalBlue',
+            'RoyalPurple',
+            'RubineRed',
+            'S',
+            'SE',
+            'SSE',
+            'SSW',
+            'SW',
+            'SaddleBrown',
+            'Salmon',
+            'SandyBrown',
+            'SeaGreen',
+            'Seashell',
+            'Sepia',
+            'Sienna',
+            'Silver',
+            'SimpleHead',
+            'SkyBlue',
+            'SlateBlue',
+            'SlateGray',
+            'Snow',
+            'SpringGreen',
+            'SteelBlue',
+            'Suppress',
+            'SuppressQuiet',
+            'TeXHead',
+            'Teal',
+            'TealBlue',
+            'Thistle',
+            'Ticksize',
+            'Tomato',
+            'Turquoise',
+            'Up',
+            'VERSION',
+            'Value',
+            'Vertical',
+            'Violet',
+            'VioletRed',
+            'W',
+            'WNW',
+            'WSW',
+            'Wheat',
+            'White',
+            'WhiteSmoke',
+            'WildStrawberry',
+            'XYAlign',
+            'YAlign',
+            'Yellow',
+            'YellowGreen',
+            'YellowOrange',
+            'allowstepping',
+            'angularsystem',
+            'animationdelay',
+            'appendsuffix',
+            'arcarrowangle',
+            'arcarrowfactor',
+            'arrow2sizelimit',
+            'arrowangle',
+            'arrowbarb',
+            'arrowdir',
+            'arrowfactor',
+            'arrowhookfactor',
+            'arrowlength',
+            'arrowsizelimit',
+            'arrowtexfactor',
+            'authorpen',
+            'axislabelfactor',
+            'background',
+            'backgroundcolor',
+            'backgroundpen',
+            'barfactor',
+            'barmarksizefactor',
+            'basealign',
+            'baselinetemplate',
+            'beveljoin',
+            'bigvertexpen',
+            'bigvertexsize',
+            'black',
+            'blue',
+            'bm',
+            'bottom',
+            'bp',
+            'brown',
+            'bullet',
+            'byfoci',
+            'byvertices',
+            'camerafactor',
+            'chartreuse',
+            'circlemarkradiusfactor',
+            'circlenodesnumberfactor',
+            'circleprecision',
+            'circlescale',
+            'cm',
+            'codefile',
+            'codepen',
+            'codeskip',
+            'colorPen',
+            'coloredNodes',
+            'coloredSegments',
+            'conditionlength',
+            'conicnodesfactor',
+            'count',
+            'cputimeformat',
+            'crossmarksizefactor',
+            'currentcoordsys',
+            'currentlight',
+            'currentpatterns',
+            'currentpen',
+            'currentpicture',
+            'currentposition',
+            'currentprojection',
+            'curvilinearsystem',
+            'cuttings',
+            'cyan',
+            'darkblue',
+            'darkbrown',
+            'darkcyan',
+            'darkgray',
+            'darkgreen',
+            'darkgrey',
+            'darkmagenta',
+            'darkolive',
+            'darkred',
+            'dashdotted',
+            'dashed',
+            'datepen',
+            'dateskip',
+            'debuggerlines',
+            'debugging',
+            'deepblue',
+            'deepcyan',
+            'deepgray',
+            'deepgreen',
+            'deepgrey',
+            'deepmagenta',
+            'deepred',
+            'default',
+            'defaultControl',
+            'defaultS',
+            'defaultbackpen',
+            'defaultcoordsys',
+            'defaultexcursion',
+            'defaultfilename',
+            'defaultformat',
+            'defaultmassformat',
+            'defaultpen',
+            'diagnostics',
+            'differentlengths',
+            'dot',
+            'dotfactor',
+            'dotframe',
+            'dotted',
+            'doublelinepen',
+            'doublelinespacing',
+            'down',
+            'duplicateFuzz',
+            'edge',
+            'ellipsenodesnumberfactor',
+            'eps',
+            'epsgeo',
+            'epsilon',
+            'evenodd',
+            'expansionfactor',
+            'extendcap',
+            'exterior',
+            'fermionpen',
+            'figureborder',
+            'figuremattpen',
+            'file3',
+            'firstnode',
+            'firststep',
+            'foregroundcolor',
+            'fuchsia',
+            'fuzz',
+            'gapfactor',
+            'ghostpen',
+            'gluonamplitude',
+            'gluonpen',
+            'gluonratio',
+            'green',
+            'grey',
+            'hatchepsilon',
+            'havepagenumber',
+            'heavyblue',
+            'heavycyan',
+            'heavygray',
+            'heavygreen',
+            'heavygrey',
+            'heavymagenta',
+            'heavyred',
+            'hwratio',
+            'hyperbolanodesnumberfactor',
+            'identity4',
+            'ignore',
+            'inXasyMode',
+            'inch',
+            'inches',
+            'includegraphicscommand',
+            'inf',
+            'infinity',
+            'institutionpen',
+            'intMax',
+            'intMin',
+            'invert',
+            'itempen',
+            'itemskip',
+            'itemstep',
+            'landscape',
+            'lastnode',
+            'left',
+            'legendhskip',
+            'legendlinelength',
+            'legendmargin',
+            'legendmarkersize',
+            'legendmaxrelativewidth',
+            'legendvskip',
+            'lightblue',
+            'lightcyan',
+            'lightgray',
+            'lightgreen',
+            'lightgrey',
+            'lightmagenta',
+            'lightolive',
+            'lightred',
+            'lightyellow',
+            'lm_infmsg',
+            'lm_shortmsg',
+            'longdashdotted',
+            'longdashed',
+            'magenta',
+            'magneticRadius',
+            'mantissaBits',
+            'markangleradius',
+            'markangleradiusfactor',
+            'markanglespace',
+            'markanglespacefactor',
+            'mediumblue',
+            'mediumcyan',
+            'mediumgray',
+            'mediumgreen',
+            'mediumgrey',
+            'mediummagenta',
+            'mediumred',
+            'mediumyellow',
+            'middle',
+            'minDistDefault',
+            'minblockheight',
+            'minblockwidth',
+            'mincirclediameter',
+            'minipagemargin',
+            'minipagewidth',
+            'minvertexangle',
+            'miterjoin',
+            'mm',
+            'momarrowfactor',
+            'momarrowlength',
+            'momarrowmargin',
+            'momarrowoffset',
+            'momarrowpen',
+            'monoPen',
+            'morepoints',
+            'nCircle',
+            'newbulletcolor',
+            'ngraph',
+            'nil',
+            'nmesh',
+            'nobasealign',
+            'nodeMarginDefault',
+            'nodesystem',
+            'nomarker',
+            'nopoint',
+            'noprimary',
+            'nullpath',
+            'nullpen',
+            'numarray',
+            'ocgindex',
+            'oldbulletcolor',
+            'olive',
+            'orange',
+            'overpaint',
+            'page',
+            'pageheight',
+            'pagemargin',
+            'pagenumberalign',
+            'pagenumberpen',
+            'pagenumberposition',
+            'pagewidth',
+            'paleblue',
+            'palecyan',
+            'palegray',
+            'palegreen',
+            'palegrey',
+
+            'palemagenta',
+            'palered',
+            'paleyellow',
+            'parabolanodesnumberfactor',
+            'perpfactor',
+            'phi',
+            'photonamplitude',
+            'photonpen',
+            'photonratio',
+            'pi',
+            'pink',
+            'plain',
+            'plain_bounds',
+            'plain_scaling',
+            'plus',
+            'preamblenodes',
+            'pt',
+            'purple',
+            'r3',
+            'r4a',
+            'r4b',
+            'randMax',
+            'realDigits',
+            'realEpsilon',
+            'realMax',
+            'realMin',
+            'red',
+            'relativesystem',
+            'right',
+            'roundcap',
+            'roundjoin',
+            'royalblue',
+            'salmon',
+            'saveFunctions',
+            'scalarpen',
+            'sequencereal',
+            'settings',
+            'shipped',
+            'signedtrailingzero',
+            'solid',
+            'springgreen',
+            'sqrtEpsilon',
+            'squarecap',
+            'squarepen',
+            'startposition',
+            'stdin',
+            'stdout',
+            'stepfactor',
+            'stepfraction',
+            'steppagenumberpen',
+            'stepping',
+            'stickmarksizefactor',
+            'stickmarkspacefactor',
+            'swap',
+            'textpen',
+            'ticksize',
+            'tildemarksizefactor',
+            'tinv',
+            'titlealign',
+            'titlepagepen',
+            'titlepageposition',
+            'titlepen',
+            'titleskip',
+            'top',
+            'trailingzero',
+            'treeLevelStep',
+            'treeMinNodeWidth',
+            'treeNodeStep',
+            'trembleAngle',
+            'trembleFrequency',
+            'trembleRandom',
+            'undefined',
+            'unitcircle',
+            'unitsquare',
+            'up',
+            'urlpen',
+            'urlskip',
+            'version',
+            'vertexpen',
+            'vertexsize',
+            'viewportmargin',
+            'viewportsize',
+            'vline',
+            'white',
+            'wye',
+            'xformStack',
+            'yellow',
+            'ylabelwidth',
+            'zerotickfuzz',
+            'zerowinding'
+        )
+    ),
     'SYMBOLS' => array(
         0 => array(
             '(', ')', '{', '}', '[', ']'
-            ),
-        1 => array('<', '>','='),
+        ),
+        1 => array('<', '>', '='),
         2 => array('+', '-', '*', '/', '%'),
         3 => array('!', '^', '&', '|'),
         4 => array('?', ':', ';'),
         5 => array('..')
-        ),
+    ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
         1 => true,
         2 => true,
         3 => true,
         4 => true
-        ),
+    ),
     'STYLES' => array(
         'KEYWORDS' => array(
             1 => 'color: #b1b100;',
             2 => 'color: #000000; font-weight: bold;',
             3 => 'color: #990000;',
             4 => 'color: #009900; font-weight: bold;'
-            ),
+        ),
         'COMMENTS' => array(
             1 => 'color: #666666;',
             2 => 'color: #339900;',
             'MULTI' => 'color: #ff0000; font-style: italic;'
-            ),
+        ),
         'ESCAPE_CHAR' => array(
             0 => 'color: #000099; font-weight: bold;',
             1 => 'color: #000099; font-weight: bold;',
@@ -130,13 +1793,13 @@ $language_data = array(
             4 => 'color: #660099; font-weight: bold;',
             5 => 'color: #006699; font-weight: bold;',
             'HARD' => '',
-            ),
+        ),
         'BRACKETS' => array(
             0 => 'color: #008000;'
-            ),
+        ),
         'STRINGS' => array(
             0 => 'color: #FF0000;'
-            ),
+        ),
         'NUMBERS' => array(
             0 => 'color: #0000dd;',
             GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
@@ -146,11 +1809,11 @@ $language_data = array(
             GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
             GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
             GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
+        ),
         'METHODS' => array(
             1 => 'color: #007788;',
             2 => 'color: #007788;'
-            ),
+        ),
         'SYMBOLS' => array(
             0 => 'color: #008000;',
             1 => 'color: #000080;',
@@ -158,35 +1821,30 @@ $language_data = array(
             3 => 'color: #000040;',
             4 => 'color: #008080;',
             5 => 'color: #009080;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
         ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+    ),
     'URLS' => array(
         1 => '',
         2 => '',
         3 => '',
         4 => ''
-        ),
+    ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
         1 => '.',
         2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
+    ),
+    'REGEXPS' => array(),
     'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
     'TAB_WIDTH' => 4,
     'PARSER_CONTROL' => array(
         'KEYWORDS' => array(
             'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#])",
             'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
-            )
         )
+    )
 );
diff --git a/htdocs/application/libraries/geshi/geshi/autoconf.php b/htdocs/application/libraries/geshi/geshi/autoconf.php
index ec1cd0a..9c1cf12 100644
--- a/htdocs/application/libraries/geshi/geshi/autoconf.php
+++ b/htdocs/application/libraries/geshi/geshi/autoconf.php
@@ -4,7 +4,7 @@
  * -----
  * Author: Mihai Vasilian (grayasm@gmail.com)
  * Copyright: (c) 2010 Mihai Vasilian
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/01/25
  *
  * autoconf language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/autohotkey.php b/htdocs/application/libraries/geshi/geshi/autohotkey.php
index f6318af..4a47d73 100644
--- a/htdocs/application/libraries/geshi/geshi/autohotkey.php
+++ b/htdocs/application/libraries/geshi/geshi/autohotkey.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Naveen Garg (naveen.garg@gmail.com)
  * Copyright: (c) 2009 Naveen Garg and GeSHi
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/06/11
  *
  * Autohotkey language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/autoit.php b/htdocs/application/libraries/geshi/geshi/autoit.php
index e794102..5742afe 100644
--- a/htdocs/application/libraries/geshi/geshi/autoit.php
+++ b/htdocs/application/libraries/geshi/geshi/autoit.php
@@ -2,39 +2,47 @@
 /*************************************************************************************
  * autoit.php
  * --------
- * Author: big_daddy (robert.i.anthony@gmail.com)
- * Copyright: (c) 2006 and to GESHi ;)
- * Release Version: 1.0.8.12
+ * Author: big_daddy, guinness & Tlem
+ * Copyright: (c) 2006-2015
+ * Release Version: 1.0.9.0
  * Date Started: 2006/01/26
  *
- * AutoIT language file for GeSHi.
+ * AutoIt: v3.3.14.2
+ * Updated: 2015/09/18
+ *
+ * AutoIt language file for GeSHi.
  *
  * CHANGES
  * -------
- * Release 1.0.8.1 (2008/09/15)
- * - Updated on 22.03.2008 By Tlem (tlem@tuxolem.fr)
- * - The link on functions will now correctly re-direct to
- * - http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm
- * - Updated whith au3.api (09.02.2008).
- * - Updated - 16 Mai 2008 - v3.2.12.0
- * - Updated - 12 June 2008 - v3.2.12.1
+ * Release 1.0.8.11 (2014/01/03) by guinness
+ * - Added: Split directives so as to point to their specific URL.
+ * - Fixed: #EndRegion not highlighting correctly.
+ * - Fixed: AutoItWrapper directives and settings were incorrectly highlighting.
+ * - Fixed: Highlighting of hex values and complex math values.
+ * - Fixed: Include file name to the correct colour scheme.
+ * - Fixed: Incorrectly highlighting the _ (underscore).
+ * - Fixed: Upper case #include being incorrectly highlighted.
+ * - Fixed: Variables and macros were being incorrectly highlighted.
+ * - Fixed: Generation based on AutoIt_php.ini file to commit only on specific GeSHi change.
+ * Release 1.0.8.1 (2008/09/15) by Tlem
+ * - Added: http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm
+ * - Fixed: The link on functions will now correctly re-direct to
  * Release 1.0.7.20 (2006/01/26)
- * - First Release
+ * - Initial Release
  *
- * Current bugs & todo:
+ * TODO:
  * ----------
- * - not sure how to get sendkeys to work " {!}, {SPACE} etc... "
- * - just copyied the regexp for variable from php so this HAVE to be checked and fixed to a better one ;)
+ * - None
  *
  * Reference: http://www.autoitscript.com/autoit3/docs/
+ *
  *************************************************************************************
  *
  *     This file is part of GeSHi.
  *
  *   GeSHi is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License,
-or
+ *   the Free Software Foundation; either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   GeSHi is distributed in the hope that it will be useful,
@@ -43,593 +51,753 @@ or
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not,
-write to the Free Software
- *   Foundation,
-Inc.,
-59 Temple Place,
-Suite 330,
-Boston,
-MA  02111-1307  USA
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  ************************************************************************************/
 
-$language_data = array (
+$language_data = array(
     'LANG_NAME' => 'AutoIt',
-    'COMMENT_SINGLE' => array(';'),
+    'COMMENT_SINGLE' => array(
+        1 => ';',
+        2 => ';~'
+    ),
     'COMMENT_MULTI' => array(
         '#comments-start' => '#comments-end',
         '#cs' => '#ce'),
     'COMMENT_REGEXP' => array(
-        0 => '/(?<!#)#(\s.*)?$/m',
-        1 => '/(?<=include)\s+<.*?>/'
-        ),
+        0 => '/(?<=(i|I)nclude)\s*<.*?>/'
+    ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
     'ESCAPE_CHAR' => '',
     'KEYWORDS' => array(
         1 => array(
-            'And','ByRef','Case','Const','ContinueCase','ContinueLoop',
-            'Default','Dim','Do','Else','ElseIf','EndFunc','EndIf','EndSelect',
-            'EndSwitch','EndWith','Enum','Exit','ExitLoop','False','For','Func',
-            'Global','If','In','Local','Next','Not','Or','ReDim','Return',
-            'Select','Step','Switch','Then','To','True','Until','WEnd','While',
-            'With'
-            ),
+            'And', 'ByRef', 'Case', 'Const', 'ContinueCase', 'ContinueLoop',
+            'Default', 'Dim', 'Do', 'Else', 'ElseIf', 'EndFunc', 'EndIf', 'EndSelect',
+            'EndSwitch', 'EndWith', 'Enum', 'Exit', 'ExitLoop', 'False', 'For', 'Func',
+            'Global', 'If', 'In', 'Local', 'Next', 'Not', 'Null', 'Or', 'ReDim',
+            'Return', 'Select', 'Static', 'Step', 'Switch', 'Then', 'To', 'True',
+            'Until', 'Volatile', 'WEnd', 'While', 'With'
+        ),
         2 => array(
-            '@AppDataCommonDir','@AppDataDir','@AutoItExe','@AutoItPID',
-            '@AutoItUnicode','@AutoItVersion','@AutoItX64','@COM_EventObj',
-            '@CommonFilesDir','@Compiled','@ComputerName','@ComSpec','@CR',
-            '@CRLF','@DesktopCommonDir','@DesktopDepth','@DesktopDir',
-            '@DesktopHeight','@DesktopRefresh','@DesktopWidth',
-            '@DocumentsCommonDir','@error','@exitCode','@exitMethod',
-            '@extended','@FavoritesCommonDir','@FavoritesDir','@GUI_CtrlHandle',
-            '@GUI_CtrlId','@GUI_DragFile','@GUI_DragId','@GUI_DropId',
-            '@GUI_WinHandle','@HomeDrive','@HomePath','@HomeShare',
-            '@HotKeyPressed','@HOUR','@InetGetActive','@InetGetBytesRead',
-            '@IPAddress1','@IPAddress2','@IPAddress3','@IPAddress4','@KBLayout',
-            '@LF','@LogonDNSDomain','@LogonDomain','@LogonServer','@MDAY',
-            '@MIN','@MON','@MyDocumentsDir','@NumParams','@OSBuild','@OSLang',
-            '@OSServicePack','@OSTYPE','@OSVersion','@ProcessorArch',
-            '@ProgramFilesDir','@ProgramsCommonDir','@ProgramsDir','@ScriptDir',
-            '@ScriptFullPath','@ScriptLineNumber','@ScriptName','@SEC',
-            '@StartMenuCommonDir','@StartMenuDir','@StartupCommonDir',
-            '@StartupDir','@SW_DISABLE','@SW_ENABLE','@SW_HIDE','@SW_LOCK',
-            '@SW_MAXIMIZE','@SW_MINIMIZE','@SW_RESTORE','@SW_SHOW',
-            '@SW_SHOWDEFAULT','@SW_SHOWMAXIMIZED','@SW_SHOWMINIMIZED',
-            '@SW_SHOWMINNOACTIVE','@SW_SHOWNA','@SW_SHOWNOACTIVATE',
-            '@SW_SHOWNORMAL','@SW_UNLOCK','@SystemDir','@TAB','@TempDir',
-            '@TRAY_ID','@TrayIconFlashing','@TrayIconVisible','@UserName',
-            '@UserProfileDir','@WDAY','@WindowsDir','@WorkingDir','@YDAY',
-            '@YEAR'
-            ),
+            '@AppDataCommonDir', '@AppDataDir', '@AutoItExe', '@AutoItPID',
+            '@AutoItVersion', '@AutoItX64', '@COM_EventObj', '@CommonFilesDir',
+            '@Compiled', '@ComputerName', '@ComSpec', '@CPUArch', '@CR', '@CRLF',
+            '@DesktopCommonDir', '@DesktopDepth', '@DesktopDir', '@DesktopHeight',
+            '@DesktopRefresh', '@DesktopWidth', '@DocumentsCommonDir', '@error',
+            '@exitCode', '@exitMethod', '@extended', '@FavoritesCommonDir',
+            '@FavoritesDir', '@GUI_CtrlHandle', '@GUI_CtrlId', '@GUI_DragFile',
+            '@GUI_DragId', '@GUI_DropId', '@GUI_WinHandle', '@HomeDrive',
+            '@HomePath', '@HomeShare', '@HotKeyPressed', '@HOUR', '@IPAddress1',
+            '@IPAddress2', '@IPAddress3', '@IPAddress4', '@KBLayout', '@LF',
+            '@LocalAppDataDir', '@LogonDNSDomain', '@LogonDomain', '@LogonServer',
+            '@MDAY', '@MIN', '@MON', '@MSEC', '@MUILang', '@MyDocumentsDir',
+            '@NumParams', '@OSArch', '@OSBuild', '@OSLang', '@OSServicePack',
+            '@OSType', '@OSVersion', '@ProgramFilesDir', '@ProgramsCommonDir',
+            '@ProgramsDir', '@ScriptDir', '@ScriptFullPath', '@ScriptLineNumber',
+            '@ScriptName', '@SEC', '@StartMenuCommonDir', '@StartMenuDir',
+            '@StartupCommonDir', '@StartupDir', '@SW_DISABLE', '@SW_ENABLE',
+            '@SW_HIDE', '@SW_LOCK', '@SW_MAXIMIZE', '@SW_MINIMIZE', '@SW_RESTORE',
+            '@SW_SHOW', '@SW_SHOWDEFAULT', '@SW_SHOWMAXIMIZED',
+            '@SW_SHOWMINIMIZED', '@SW_SHOWMINNOACTIVE', '@SW_SHOWNA',
+            '@SW_SHOWNOACTIVATE', '@SW_SHOWNORMAL', '@SW_UNLOCK', '@SystemDir',
+            '@TAB', '@TempDir', '@TRAY_ID', '@TrayIconFlashing', '@TrayIconVisible',
+            '@UserName', '@UserProfileDir', '@WDAY', '@WindowsDir', '@WorkingDir',
+            '@YDAY', '@YEAR'
+        ),
         3 => array(
-            'Abs','ACos','AdlibDisable','AdlibEnable','Asc','AscW','ASin',
-            'Assign','ATan','AutoItSetOption','AutoItWinGetTitle',
-            'AutoItWinSetTitle','Beep','Binary','BinaryLen','BinaryMid',
-            'BinaryToString','BitAND','BitNOT','BitOR','BitRotate','BitShift',
-            'BitXOR','BlockInput','Break','Call','CDTray','Ceiling','Chr',
-            'ChrW','ClipGet','ClipPut','ConsoleRead','ConsoleWrite',
-            'ConsoleWriteError','ControlClick','ControlCommand',
-            'ControlDisable','ControlEnable','ControlFocus','ControlGetFocus',
-            'ControlGetHandle','ControlGetPos','ControlGetText','ControlHide',
-            'ControlListView','ControlMove','ControlSend','ControlSetText',
-            'ControlShow','ControlTreeView','Cos','Dec','DirCopy','DirCreate',
-            'DirGetSize','DirMove','DirRemove','DllCall','DllCallbackFree',
-            'DllCallbackGetPtr','DllCallbackRegister','DllClose','DllOpen',
-            'DllStructCreate','DllStructGetData','DllStructGetPtr',
-            'DllStructGetSize','DllStructSetData','DriveGetDrive',
-            'DriveGetFileSystem','DriveGetLabel','DriveGetSerial',
-            'DriveGetType','DriveMapAdd','DriveMapDel','DriveMapGet',
-            'DriveSetLabel','DriveSpaceFree','DriveSpaceTotal','DriveStatus',
-            'EnvGet','EnvSet','EnvUpdate','Eval','Execute','Exp',
-            'FileChangeDir','FileClose','FileCopy','FileCreateNTFSLink',
-            'FileCreateShortcut','FileDelete','FileExists','FileFindFirstFile',
-            'FileFindNextFile','FileGetAttrib','FileGetLongName',
-            'FileGetShortcut','FileGetShortName','FileGetSize','FileGetTime',
-            'FileGetVersion','FileInstall','FileMove','FileOpen',
-            'FileOpenDialog','FileRead','FileReadLine','FileRecycle',
-            'FileRecycleEmpty','FileSaveDialog','FileSelectFolder',
-            'FileSetAttrib','FileSetTime','FileWrite','FileWriteLine','Floor',
-            'FtpSetProxy','GUICreate','GUICtrlCreateAvi','GUICtrlCreateButton',
-            'GUICtrlCreateCheckbox','GUICtrlCreateCombo',
-            'GUICtrlCreateContextMenu','GUICtrlCreateDate','GUICtrlCreateDummy',
-            'GUICtrlCreateEdit','GUICtrlCreateGraphic','GUICtrlCreateGroup',
-            'GUICtrlCreateIcon','GUICtrlCreateInput','GUICtrlCreateLabel',
-            'GUICtrlCreateList','GUICtrlCreateListView',
-            'GUICtrlCreateListViewItem','GUICtrlCreateMenu',
-            'GUICtrlCreateMenuItem','GUICtrlCreateMonthCal','GUICtrlCreateObj',
-            'GUICtrlCreatePic','GUICtrlCreateProgress','GUICtrlCreateRadio',
-            'GUICtrlCreateSlider','GUICtrlCreateTab','GUICtrlCreateTabItem',
-            'GUICtrlCreateTreeView','GUICtrlCreateTreeViewItem',
-            'GUICtrlCreateUpdown','GUICtrlDelete','GUICtrlGetHandle',
-            'GUICtrlGetState','GUICtrlRead','GUICtrlRecvMsg',
-            'GUICtrlRegisterListViewSort','GUICtrlSendMsg','GUICtrlSendToDummy',
-            'GUICtrlSetBkColor','GUICtrlSetColor','GUICtrlSetCursor',
-            'GUICtrlSetData','GUICtrlSetFont','GUICtrlSetDefColor',
-            'GUICtrlSetDefBkColor','GUICtrlSetGraphic','GUICtrlSetImage',
-            'GUICtrlSetLimit','GUICtrlSetOnEvent','GUICtrlSetPos',
-            'GUICtrlSetResizing','GUICtrlSetState','GUICtrlSetStyle',
-            'GUICtrlSetTip','GUIDelete','GUIGetCursorInfo','GUIGetMsg',
-            'GUIGetStyle','GUIRegisterMsg','GUISetAccelerators()',
-            'GUISetBkColor','GUISetCoord','GUISetCursor','GUISetFont',
-            'GUISetHelp','GUISetIcon','GUISetOnEvent','GUISetState',
-            'GUISetStyle','GUIStartGroup','GUISwitch','Hex','HotKeySet',
-            'HttpSetProxy','HWnd','InetGet','InetGetSize','IniDelete','IniRead',
-            'IniReadSection','IniReadSectionNames','IniRenameSection',
-            'IniWrite','IniWriteSection','InputBox','Int','IsAdmin','IsArray',
-            'IsBinary','IsBool','IsDeclared','IsDllStruct','IsFloat','IsHWnd',
-            'IsInt','IsKeyword','IsNumber','IsObj','IsPtr','IsString','Log',
-            'MemGetStats','Mod','MouseClick','MouseClickDrag','MouseDown',
-            'MouseGetCursor','MouseGetPos','MouseMove','MouseUp','MouseWheel',
-            'MsgBox','Number','ObjCreate','ObjEvent','ObjGet','ObjName','Opt',
-            'Ping','PixelChecksum','PixelGetColor','PixelSearch','PluginClose',
-            'PluginOpen','ProcessClose','ProcessExists','ProcessGetStats',
-            'ProcessList','ProcessSetPriority','ProcessWait','ProcessWaitClose',
-            'ProgressOff','ProgressOn','ProgressSet','Ptr','Random','RegDelete',
-            'RegEnumKey','RegEnumVal','RegRead','RegWrite','Round','Run',
-            'RunAs','RunAsWait','RunWait','Send','SendKeepActive','SetError',
-            'SetExtended','ShellExecute','ShellExecuteWait','Shutdown','Sin',
-            'Sleep','SoundPlay','SoundSetWaveVolume','SplashImageOn',
-            'SplashOff','SplashTextOn','Sqrt','SRandom','StatusbarGetText',
-            'StderrRead','StdinWrite','StdioClose','StdoutRead','String',
-            'StringAddCR','StringCompare','StringFormat','StringInStr',
-            'StringIsAlNum','StringIsAlpha','StringIsASCII','StringIsDigit',
-            'StringIsFloat','StringIsInt','StringIsLower','StringIsSpace',
-            'StringIsUpper','StringIsXDigit','StringLeft','StringLen',
-            'StringLower','StringMid','StringRegExp','StringRegExpReplace',
-            'StringReplace','StringRight','StringSplit','StringStripCR',
-            'StringStripWS','StringToBinary','StringTrimLeft','StringTrimRight',
-            'StringUpper','Tan','TCPAccept','TCPCloseSocket','TCPConnect',
-            'TCPListen','TCPNameToIP','TCPRecv','TCPSend','TCPShutdown',
-            'TCPStartup','TimerDiff','TimerInit','ToolTip','TrayCreateItem',
-            'TrayCreateMenu','TrayGetMsg','TrayItemDelete','TrayItemGetHandle',
-            'TrayItemGetState','TrayItemGetText','TrayItemSetOnEvent',
-            'TrayItemSetState','TrayItemSetText','TraySetClick','TraySetIcon',
-            'TraySetOnEvent','TraySetPauseIcon','TraySetState','TraySetToolTip',
-            'TrayTip','UBound','UDPBind','UDPCloseSocket','UDPOpen','UDPRecv',
-            'UDPSend','UDPShutdown','UDPStartup','VarGetType','WinActivate',
-            'WinActive','WinClose','WinExists','WinFlash','WinGetCaretPos',
-            'WinGetClassList','WinGetClientSize','WinGetHandle','WinGetPos',
-            'WinGetProcess','WinGetState','WinGetText','WinGetTitle','WinKill',
-            'WinList','WinMenuSelectItem','WinMinimizeAll','WinMinimizeAllUndo',
-            'WinMove','WinSetOnTop','WinSetState','WinSetTitle','WinSetTrans',
-            'WinWait','WinWaitActive','WinWaitClose','WinWaitNotActive'
-            ),
+            'Abs', 'ACos', 'AdlibRegister', 'AdlibUnRegister', 'Asc', 'AscW', 'ASin',
+            'Assign', 'ATan', 'AutoItSetOption', 'AutoItWinGetTitle',
+            'AutoItWinSetTitle', 'Beep', 'Binary', 'BinaryLen', 'BinaryMid',
+            'BinaryToString', 'BitAND', 'BitNOT', 'BitOR', 'BitRotate', 'BitShift',
+            'BitXOR', 'BlockInput', 'Break', 'Call', 'CDTray', 'Ceiling', 'Chr',
+            'ChrW', 'ClipGet', 'ClipPut', 'ConsoleRead', 'ConsoleWrite',
+            'ConsoleWriteError', 'ControlClick', 'ControlCommand',
+            'ControlDisable', 'ControlEnable', 'ControlFocus', 'ControlGetFocus',
+            'ControlGetHandle', 'ControlGetPos', 'ControlGetText', 'ControlHide',
+            'ControlListView', 'ControlMove', 'ControlSend', 'ControlSetText',
+            'ControlShow', 'ControlTreeView', 'Cos', 'Dec', 'DirCopy', 'DirCreate',
+            'DirGetSize', 'DirMove', 'DirRemove', 'DllCall', 'DllCallAddress',
+            'DllCallbackFree', 'DllCallbackGetPtr', 'DllCallbackRegister',
+            'DllClose', 'DllOpen', 'DllStructCreate', 'DllStructGetData',
+            'DllStructGetPtr', 'DllStructGetSize', 'DllStructSetData',
+            'DriveGetDrive', 'DriveGetFileSystem', 'DriveGetLabel',
+            'DriveGetSerial', 'DriveGetType', 'DriveMapAdd', 'DriveMapDel',
+            'DriveMapGet', 'DriveSetLabel', 'DriveSpaceFree', 'DriveSpaceTotal',
+            'DriveStatus', 'EnvGet', 'EnvSet', 'EnvUpdate', 'Eval', 'Execute', 'Exp',
+            'FileChangeDir', 'FileClose', 'FileCopy', 'FileCreateNTFSLink',
+            'FileCreateShortcut', 'FileDelete', 'FileExists', 'FileFindFirstFile',
+            'FileFindNextFile', 'FileFlush', 'FileGetAttrib', 'FileGetEncoding',
+            'FileGetLongName', 'FileGetPos', 'FileGetShortcut', 'FileGetShortName',
+            'FileGetSize', 'FileGetTime', 'FileGetVersion', 'FileInstall',
+            'FileMove', 'FileOpen', 'FileOpenDialog', 'FileRead', 'FileReadLine',
+            'FileReadToArray', 'FileRecycle', 'FileRecycleEmpty', 'FileSaveDialog',
+            'FileSelectFolder', 'FileSetAttrib', 'FileSetEnd', 'FileSetPos',
+            'FileSetTime', 'FileWrite', 'FileWriteLine', 'Floor', 'FtpSetProxy',
+            'FuncName', 'GUICreate', 'GUICtrlCreateAvi', 'GUICtrlCreateButton',
+            'GUICtrlCreateCheckbox', 'GUICtrlCreateCombo',
+            'GUICtrlCreateContextMenu', 'GUICtrlCreateDate', 'GUICtrlCreateDummy',
+            'GUICtrlCreateEdit', 'GUICtrlCreateGraphic', 'GUICtrlCreateGroup',
+            'GUICtrlCreateIcon', 'GUICtrlCreateInput', 'GUICtrlCreateLabel',
+            'GUICtrlCreateList', 'GUICtrlCreateListView',
+            'GUICtrlCreateListViewItem', 'GUICtrlCreateMenu',
+            'GUICtrlCreateMenuItem', 'GUICtrlCreateMonthCal', 'GUICtrlCreateObj',
+            'GUICtrlCreatePic', 'GUICtrlCreateProgress', 'GUICtrlCreateRadio',
+            'GUICtrlCreateSlider', 'GUICtrlCreateTab', 'GUICtrlCreateTabItem',
+            'GUICtrlCreateTreeView', 'GUICtrlCreateTreeViewItem',
+            'GUICtrlCreateUpdown', 'GUICtrlDelete', 'GUICtrlGetHandle',
+            'GUICtrlGetState', 'GUICtrlRead', 'GUICtrlRecvMsg',
+            'GUICtrlRegisterListViewSort', 'GUICtrlSendMsg', 'GUICtrlSendToDummy',
+            'GUICtrlSetBkColor', 'GUICtrlSetColor', 'GUICtrlSetCursor',
+            'GUICtrlSetData', 'GUICtrlSetDefBkColor', 'GUICtrlSetDefColor',
+            'GUICtrlSetFont', 'GUICtrlSetGraphic', 'GUICtrlSetImage',
+            'GUICtrlSetLimit', 'GUICtrlSetOnEvent', 'GUICtrlSetPos',
+            'GUICtrlSetResizing', 'GUICtrlSetState', 'GUICtrlSetStyle',
+            'GUICtrlSetTip', 'GUIDelete', 'GUIGetCursorInfo', 'GUIGetMsg',
+            'GUIGetStyle', 'GUIRegisterMsg', 'GUISetAccelerators', 'GUISetBkColor',
+            'GUISetCoord', 'GUISetCursor', 'GUISetFont', 'GUISetHelp', 'GUISetIcon',
+            'GUISetOnEvent', 'GUISetState', 'GUISetStyle', 'GUIStartGroup',
+            'GUISwitch', 'Hex', 'HotKeySet', 'HttpSetProxy', 'HttpSetUserAgent',
+            'HWnd', 'InetClose', 'InetGet', 'InetGetInfo', 'InetGetSize', 'InetRead',
+            'IniDelete', 'IniRead', 'IniReadSection', 'IniReadSectionNames',
+            'IniRenameSection', 'IniWrite', 'IniWriteSection', 'InputBox', 'Int',
+            'IsAdmin', 'IsArray', 'IsBinary', 'IsBool', 'IsDeclared', 'IsDllStruct',
+            'IsFloat', 'IsFunc', 'IsHWnd', 'IsInt', 'IsKeyword', 'IsNumber', 'IsObj',
+            'IsPtr', 'IsString', 'Log', 'MemGetStats', 'Mod', 'MouseClick',
+            'MouseClickDrag', 'MouseDown', 'MouseGetCursor', 'MouseGetPos',
+            'MouseMove', 'MouseUp', 'MouseWheel', 'MsgBox', 'Number', 'ObjCreate',
+            'ObjCreateInterface', 'ObjEvent', 'ObjGet', 'ObjName',
+            'OnAutoItExitRegister', 'OnAutoItExitUnRegister', 'Opt', 'Ping',
+            'PixelChecksum', 'PixelGetColor', 'PixelSearch', 'ProcessClose',
+            'ProcessExists', 'ProcessGetStats', 'ProcessList',
+            'ProcessSetPriority', 'ProcessWait', 'ProcessWaitClose', 'ProgressOff',
+            'ProgressOn', 'ProgressSet', 'Ptr', 'Random', 'RegDelete', 'RegEnumKey',
+            'RegEnumVal', 'RegRead', 'RegWrite', 'Round', 'Run', 'RunAs', 'RunAsWait',
+            'RunWait', 'Send', 'SendKeepActive', 'SetError', 'SetExtended',
+            'ShellExecute', 'ShellExecuteWait', 'Shutdown', 'Sin', 'Sleep',
+            'SoundPlay', 'SoundSetWaveVolume', 'SplashImageOn', 'SplashOff',
+            'SplashTextOn', 'Sqrt', 'SRandom', 'StatusbarGetText', 'StderrRead',
+            'StdinWrite', 'StdioClose', 'StdoutRead', 'String', 'StringAddCR',
+            'StringCompare', 'StringFormat', 'StringFromASCIIArray', 'StringInStr',
+            'StringIsAlNum', 'StringIsAlpha', 'StringIsASCII', 'StringIsDigit',
+            'StringIsFloat', 'StringIsInt', 'StringIsLower', 'StringIsSpace',
+            'StringIsUpper', 'StringIsXDigit', 'StringLeft', 'StringLen',
+            'StringLower', 'StringMid', 'StringRegExp', 'StringRegExpReplace',
+            'StringReplace', 'StringReverse', 'StringRight', 'StringSplit',
+            'StringStripCR', 'StringStripWS', 'StringToASCIIArray',
+            'StringToBinary', 'StringTrimLeft', 'StringTrimRight', 'StringUpper',
+            'Tan', 'TCPAccept', 'TCPCloseSocket', 'TCPConnect', 'TCPListen',
+            'TCPNameToIP', 'TCPRecv', 'TCPSend', 'TCPShutdown', 'TCPStartup',
+            'TimerDiff', 'TimerInit', 'ToolTip', 'TrayCreateItem', 'TrayCreateMenu',
+            'TrayGetMsg', 'TrayItemDelete', 'TrayItemGetHandle',
+            'TrayItemGetState', 'TrayItemGetText', 'TrayItemSetOnEvent',
+            'TrayItemSetState', 'TrayItemSetText', 'TraySetClick', 'TraySetIcon',
+            'TraySetOnEvent', 'TraySetPauseIcon', 'TraySetState', 'TraySetToolTip',
+            'TrayTip', 'UBound', 'UDPBind', 'UDPCloseSocket', 'UDPOpen', 'UDPRecv',
+            'UDPSend', 'UDPShutdown', 'UDPStartup', 'VarGetType', 'WinActivate',
+            'WinActive', 'WinClose', 'WinExists', 'WinFlash', 'WinGetCaretPos',
+            'WinGetClassList', 'WinGetClientSize', 'WinGetHandle', 'WinGetPos',
+            'WinGetProcess', 'WinGetState', 'WinGetText', 'WinGetTitle', 'WinKill',
+            'WinList', 'WinMenuSelectItem', 'WinMinimizeAll', 'WinMinimizeAllUndo',
+            'WinMove', 'WinSetOnTop', 'WinSetState', 'WinSetTitle', 'WinSetTrans',
+            'WinWait', 'WinWaitActive', 'WinWaitClose', 'WinWaitNotActive'
+        ),
         4 => array(
-            'ArrayAdd','ArrayBinarySearch','ArrayConcatenate','ArrayDelete',
-            'ArrayDisplay','ArrayFindAll','ArrayInsert','ArrayMax',
-            'ArrayMaxIndex','ArrayMin','ArrayMinIndex','ArrayPop','ArrayPush',
-            'ArrayReverse','ArraySearch','ArraySort','ArraySwap','ArrayToClip',
-            'ArrayToString','ArrayTrim','ChooseColor','ChooseFont',
-            'ClipBoard_ChangeChain','ClipBoard_Close','ClipBoard_CountFormats',
-            'ClipBoard_Empty','ClipBoard_EnumFormats','ClipBoard_FormatStr',
-            'ClipBoard_GetData','ClipBoard_GetDataEx','ClipBoard_GetFormatName',
-            'ClipBoard_GetOpenWindow','ClipBoard_GetOwner',
-            'ClipBoard_GetPriorityFormat','ClipBoard_GetSequenceNumber',
-            'ClipBoard_GetViewer','ClipBoard_IsFormatAvailable',
-            'ClipBoard_Open','ClipBoard_RegisterFormat','ClipBoard_SetData',
-            'ClipBoard_SetDataEx','ClipBoard_SetViewer','ClipPutFile',
-            'ColorConvertHSLtoRGB','ColorConvertRGBtoHSL','ColorGetBlue',
-            'ColorGetGreen','ColorGetRed','Date_Time_CompareFileTime',
-            'Date_Time_DOSDateTimeToArray','Date_Time_DOSDateTimeToFileTime',
-            'Date_Time_DOSDateTimeToStr','Date_Time_DOSDateToArray',
-            'Date_Time_DOSDateToStr','Date_Time_DOSTimeToArray',
-            'Date_Time_DOSTimeToStr','Date_Time_EncodeFileTime',
-            'Date_Time_EncodeSystemTime','Date_Time_FileTimeToArray',
+            'Array1DToHistogram', 'ArrayAdd', 'ArrayBinarySearch',
+            'ArrayColDelete', 'ArrayColInsert', 'ArrayCombinations',
+            'ArrayConcatenate', 'ArrayDelete', 'ArrayDisplay', 'ArrayExtract',
+            'ArrayFindAll', 'ArrayInsert', 'ArrayMax', 'ArrayMaxIndex', 'ArrayMin',
+            'ArrayMinIndex', 'ArrayPermute', 'ArrayPop', 'ArrayPush',
+            'ArrayReverse', 'ArraySearch', 'ArrayShuffle', 'ArraySort', 'ArraySwap',
+            'ArrayToClip', 'ArrayToString', 'ArrayTranspose', 'ArrayTrim',
+            'ArrayUnique', 'Assert', 'ChooseColor', 'ChooseFont',
+            'ClipBoard_ChangeChain', 'ClipBoard_Close', 'ClipBoard_CountFormats',
+            'ClipBoard_Empty', 'ClipBoard_EnumFormats', 'ClipBoard_FormatStr',
+            'ClipBoard_GetData', 'ClipBoard_GetDataEx', 'ClipBoard_GetFormatName',
+            'ClipBoard_GetOpenWindow', 'ClipBoard_GetOwner',
+            'ClipBoard_GetPriorityFormat', 'ClipBoard_GetSequenceNumber',
+            'ClipBoard_GetViewer', 'ClipBoard_IsFormatAvailable',
+            'ClipBoard_Open', 'ClipBoard_RegisterFormat', 'ClipBoard_SetData',
+            'ClipBoard_SetDataEx', 'ClipBoard_SetViewer', 'ClipPutFile',
+            'ColorConvertHSLtoRGB', 'ColorConvertRGBtoHSL', 'ColorGetBlue',
+            'ColorGetCOLORREF', 'ColorGetGreen', 'ColorGetRed', 'ColorGetRGB',
+            'ColorSetCOLORREF', 'ColorSetRGB', 'Crypt_DecryptData',
+            'Crypt_DecryptFile', 'Crypt_DeriveKey', 'Crypt_DestroyKey',
+            'Crypt_EncryptData', 'Crypt_EncryptFile', 'Crypt_GenRandom',
+            'Crypt_HashData', 'Crypt_HashFile', 'Crypt_Shutdown', 'Crypt_Startup',
+            'DateAdd', 'DateDayOfWeek', 'DateDaysInMonth', 'DateDiff',
+            'DateIsLeapYear', 'DateIsValid', 'DateTimeFormat', 'DateTimeSplit',
+            'DateToDayOfWeek', 'DateToDayOfWeekISO', 'DateToDayValue',
+            'DateToMonth', 'Date_Time_CompareFileTime',
+            'Date_Time_DOSDateTimeToArray', 'Date_Time_DOSDateTimeToFileTime',
+            'Date_Time_DOSDateTimeToStr', 'Date_Time_DOSDateToArray',
+            'Date_Time_DOSDateToStr', 'Date_Time_DOSTimeToArray',
+            'Date_Time_DOSTimeToStr', 'Date_Time_EncodeFileTime',
+            'Date_Time_EncodeSystemTime', 'Date_Time_FileTimeToArray',
             'Date_Time_FileTimeToDOSDateTime',
-            'Date_Time_FileTimeToLocalFileTime','Date_Time_FileTimeToStr',
-            'Date_Time_FileTimeToSystemTime','Date_Time_GetFileTime',
-            'Date_Time_GetLocalTime','Date_Time_GetSystemTime',
+            'Date_Time_FileTimeToLocalFileTime', 'Date_Time_FileTimeToStr',
+            'Date_Time_FileTimeToSystemTime', 'Date_Time_GetFileTime',
+            'Date_Time_GetLocalTime', 'Date_Time_GetSystemTime',
             'Date_Time_GetSystemTimeAdjustment',
-            'Date_Time_GetSystemTimeAsFileTime',
-            'Date_Time_GetSystemTimes','Date_Time_GetTickCount',
-            'Date_Time_GetTimeZoneInformation',
-            'Date_Time_LocalFileTimeToFileTime','Date_Time_SetFileTime',
-            'Date_Time_SetLocalTime','Date_Time_SetSystemTime',
+            'Date_Time_GetSystemTimeAsFileTime', 'Date_Time_GetSystemTimes',
+            'Date_Time_GetTickCount', 'Date_Time_GetTimeZoneInformation',
+            'Date_Time_LocalFileTimeToFileTime', 'Date_Time_SetFileTime',
+            'Date_Time_SetLocalTime', 'Date_Time_SetSystemTime',
             'Date_Time_SetSystemTimeAdjustment',
-            'Date_Time_SetTimeZoneInformation','Date_Time_SystemTimeToArray',
-            'Date_Time_SystemTimeToDateStr','Date_Time_SystemTimeToDateTimeStr',
-            'Date_Time_SystemTimeToFileTime','Date_Time_SystemTimeToTimeStr',
+            'Date_Time_SetTimeZoneInformation', 'Date_Time_SystemTimeToArray',
+            'Date_Time_SystemTimeToDateStr', 'Date_Time_SystemTimeToDateTimeStr',
+            'Date_Time_SystemTimeToFileTime', 'Date_Time_SystemTimeToTimeStr',
             'Date_Time_SystemTimeToTzSpecificLocalTime',
-            'Date_Time_TzSpecificLocalTimeToSystemTime','DateAdd',
-            'DateDayOfWeek','DateDaysInMonth','DateDiff','DateIsLeapYear',
-            'DateIsValid','DateTimeFormat','DateTimeSplit','DateToDayOfWeek',
-            'DateToDayOfWeekISO','DateToDayValue','DateToMonth',
-            'DayValueToDate','DebugBugReportEnv','DebugOut','DebugSetup',
-            'Degree','EventLog__Backup','EventLog__Clear','EventLog__Close',
-            'EventLog__Count','EventLog__DeregisterSource','EventLog__Full',
-            'EventLog__Notify','EventLog__Oldest','EventLog__Open',
-            'EventLog__OpenBackup','EventLog__Read','EventLog__RegisterSource',
-            'EventLog__Report','FileCountLines','FileCreate','FileListToArray',
-            'FilePrint','FileReadToArray','FileWriteFromArray',
-            'FileWriteLog','FileWriteToLine','GDIPlus_ArrowCapCreate',
-            'GDIPlus_ArrowCapDispose','GDIPlus_ArrowCapGetFillState',
-            'GDIPlus_ArrowCapGetHeight','GDIPlus_ArrowCapGetMiddleInset',
-            'GDIPlus_ArrowCapGetWidth','GDIPlus_ArrowCapSetFillState',
-            'GDIPlus_ArrowCapSetHeight','GDIPlus_ArrowCapSetMiddleInset',
-            'GDIPlus_ArrowCapSetWidth','GDIPlus_BitmapCloneArea',
-            'GDIPlus_BitmapCreateFromFile','GDIPlus_BitmapCreateFromGraphics',
-            'GDIPlus_BitmapCreateFromHBITMAP',
-            'GDIPlus_BitmapCreateHBITMAPFromBitmap','GDIPlus_BitmapDispose',
-            'GDIPlus_BitmapLockBits','GDIPlus_BitmapUnlockBits',
-            'GDIPlus_BrushClone','GDIPlus_BrushCreateSolid',
-            'GDIPlus_BrushDispose','GDIPlus_BrushGetType',
-            'GDIPlus_CustomLineCapDispose','GDIPlus_Decoders',
-            'GDIPlus_DecodersGetCount','GDIPlus_DecodersGetSize',
-            'GDIPlus_Encoders','GDIPlus_EncodersGetCLSID',
-            'GDIPlus_EncodersGetCount','GDIPlus_EncodersGetParamList',
-            'GDIPlus_EncodersGetParamListSize','GDIPlus_EncodersGetSize',
-            'GDIPlus_FontCreate','GDIPlus_FontDispose',
-            'GDIPlus_FontFamilyCreate','GDIPlus_FontFamilyDispose',
-            'GDIPlus_GraphicsClear','GDIPlus_GraphicsCreateFromHDC',
-            'GDIPlus_GraphicsCreateFromHWND','GDIPlus_GraphicsDispose',
-            'GDIPlus_GraphicsDrawArc','GDIPlus_GraphicsDrawBezier',
-            'GDIPlus_GraphicsDrawClosedCurve','GDIPlus_GraphicsDrawCurve',
-            'GDIPlus_GraphicsDrawEllipse','GDIPlus_GraphicsDrawImage',
-            'GDIPlus_GraphicsDrawImageRect','GDIPlus_GraphicsDrawImageRectRect',
-            'GDIPlus_GraphicsDrawLine','GDIPlus_GraphicsDrawPie',
-            'GDIPlus_GraphicsDrawPolygon','GDIPlus_GraphicsDrawRect',
-            'GDIPlus_GraphicsDrawString','GDIPlus_GraphicsDrawStringEx',
-            'GDIPlus_GraphicsFillClosedCurve','GDIPlus_GraphicsFillEllipse',
-            'GDIPlus_GraphicsFillPie','GDIPlus_GraphicsFillRect',
-            'GDIPlus_GraphicsGetDC','GDIPlus_GraphicsGetSmoothingMode',
-            'GDIPlus_GraphicsMeasureString','GDIPlus_GraphicsReleaseDC',
-            'GDIPlus_GraphicsSetSmoothingMode','GDIPlus_GraphicsSetTransform',
-            'GDIPlus_ImageDispose','GDIPlus_ImageGetGraphicsContext',
-            'GDIPlus_ImageGetHeight','GDIPlus_ImageGetWidth',
-            'GDIPlus_ImageLoadFromFile','GDIPlus_ImageSaveToFile',
-            'GDIPlus_ImageSaveToFileEx','GDIPlus_MatrixCreate',
-            'GDIPlus_MatrixDispose','GDIPlus_MatrixRotate','GDIPlus_ParamAdd',
-            'GDIPlus_ParamInit','GDIPlus_PenCreate','GDIPlus_PenDispose',
-            'GDIPlus_PenGetAlignment','GDIPlus_PenGetColor',
-            'GDIPlus_PenGetCustomEndCap','GDIPlus_PenGetDashCap',
-            'GDIPlus_PenGetDashStyle','GDIPlus_PenGetEndCap',
-            'GDIPlus_PenGetWidth','GDIPlus_PenSetAlignment',
-            'GDIPlus_PenSetColor','GDIPlus_PenSetCustomEndCap',
-            'GDIPlus_PenSetDashCap','GDIPlus_PenSetDashStyle',
-            'GDIPlus_PenSetEndCap','GDIPlus_PenSetWidth','GDIPlus_RectFCreate',
-            'GDIPlus_Shutdown','GDIPlus_Startup','GDIPlus_StringFormatCreate',
-            'GDIPlus_StringFormatDispose','GetIP','GUICtrlAVI_Close',
-            'GUICtrlAVI_Create','GUICtrlAVI_Destroy','GUICtrlAVI_Open',
-            'GUICtrlAVI_OpenEx','GUICtrlAVI_Play','GUICtrlAVI_Seek',
-            'GUICtrlAVI_Show','GUICtrlAVI_Stop','GUICtrlButton_Click',
-            'GUICtrlButton_Create','GUICtrlButton_Destroy',
-            'GUICtrlButton_Enable','GUICtrlButton_GetCheck',
-            'GUICtrlButton_GetFocus','GUICtrlButton_GetIdealSize',
-            'GUICtrlButton_GetImage','GUICtrlButton_GetImageList',
-            'GUICtrlButton_GetState','GUICtrlButton_GetText',
-            'GUICtrlButton_GetTextMargin','GUICtrlButton_SetCheck',
-            'GUICtrlButton_SetFocus','GUICtrlButton_SetImage',
-            'GUICtrlButton_SetImageList','GUICtrlButton_SetSize',
-            'GUICtrlButton_SetState','GUICtrlButton_SetStyle',
-            'GUICtrlButton_SetText','GUICtrlButton_SetTextMargin',
-            'GUICtrlButton_Show','GUICtrlComboBox_AddDir',
-            'GUICtrlComboBox_AddString','GUICtrlComboBox_AutoComplete',
-            'GUICtrlComboBox_BeginUpdate','GUICtrlComboBox_Create',
-            'GUICtrlComboBox_DeleteString','GUICtrlComboBox_Destroy',
-            'GUICtrlComboBox_EndUpdate','GUICtrlComboBox_FindString',
-            'GUICtrlComboBox_FindStringExact','GUICtrlComboBox_GetComboBoxInfo',
-            'GUICtrlComboBox_GetCount','GUICtrlComboBox_GetCurSel',
-            'GUICtrlComboBox_GetDroppedControlRect',
-            'GUICtrlComboBox_GetDroppedControlRectEx',
-            'GUICtrlComboBox_GetDroppedState','GUICtrlComboBox_GetDroppedWidth',
-            'GUICtrlComboBox_GetEditSel','GUICtrlComboBox_GetEditText',
-            'GUICtrlComboBox_GetExtendedUI',
-            'GUICtrlComboBox_GetHorizontalExtent',
-            'GUICtrlComboBox_GetItemHeight','GUICtrlComboBox_GetLBText',
-            'GUICtrlComboBox_GetLBTextLen','GUICtrlComboBox_GetList',
-            'GUICtrlComboBox_GetListArray','GUICtrlComboBox_GetLocale',
-            'GUICtrlComboBox_GetLocaleCountry','GUICtrlComboBox_GetLocaleLang',
-            'GUICtrlComboBox_GetLocalePrimLang',
-            'GUICtrlComboBox_GetLocaleSubLang','GUICtrlComboBox_GetMinVisible',
-            'GUICtrlComboBox_GetTopIndex','GUICtrlComboBox_InitStorage',
-            'GUICtrlComboBox_InsertString','GUICtrlComboBox_LimitText',
-            'GUICtrlComboBox_ReplaceEditSel','GUICtrlComboBox_ResetContent',
-            'GUICtrlComboBox_SelectString','GUICtrlComboBox_SetCurSel',
-            'GUICtrlComboBox_SetDroppedWidth','GUICtrlComboBox_SetEditSel',
-            'GUICtrlComboBox_SetEditText','GUICtrlComboBox_SetExtendedUI',
-            'GUICtrlComboBox_SetHorizontalExtent',
-            'GUICtrlComboBox_SetItemHeight','GUICtrlComboBox_SetMinVisible',
-            'GUICtrlComboBox_SetTopIndex','GUICtrlComboBox_ShowDropDown',
-            'GUICtrlComboBoxEx_AddDir','GUICtrlComboBoxEx_AddString',
-            'GUICtrlComboBoxEx_BeginUpdate','GUICtrlComboBoxEx_Create',
-            'GUICtrlComboBoxEx_CreateSolidBitMap',
-            'GUICtrlComboBoxEx_DeleteString','GUICtrlComboBoxEx_Destroy',
-            'GUICtrlComboBoxEx_EndUpdate','GUICtrlComboBoxEx_FindStringExact',
+            'Date_Time_TzSpecificLocalTimeToSystemTime', 'DayValueToDate',
+            'DebugBugReportEnv', 'DebugCOMError', 'DebugOut', 'DebugReport',
+            'DebugReportEx', 'DebugReportVar', 'DebugSetup', 'Degree',
+            'EventLog__Backup', 'EventLog__Clear', 'EventLog__Close',
+            'EventLog__Count', 'EventLog__DeregisterSource', 'EventLog__Full',
+            'EventLog__Notify', 'EventLog__Oldest', 'EventLog__Open',
+            'EventLog__OpenBackup', 'EventLog__Read', 'EventLog__RegisterSource',
+            'EventLog__Report', 'Excel_BookAttach', 'Excel_BookClose',
+            'Excel_BookList', 'Excel_BookNew', 'Excel_BookOpen',
+            'Excel_BookOpenText', 'Excel_BookSave', 'Excel_BookSaveAs',
+            'Excel_Close', 'Excel_ColumnToLetter', 'Excel_ColumnToNumber',
+            'Excel_ConvertFormula', 'Excel_Export', 'Excel_FilterGet',
+            'Excel_FilterSet', 'Excel_Open', 'Excel_PictureAdd', 'Excel_Print',
+            'Excel_RangeCopyPaste', 'Excel_RangeDelete', 'Excel_RangeFind',
+            'Excel_RangeInsert', 'Excel_RangeLinkAddRemove', 'Excel_RangeRead',
+            'Excel_RangeReplace', 'Excel_RangeSort', 'Excel_RangeValidate',
+            'Excel_RangeWrite', 'Excel_SheetAdd', 'Excel_SheetCopyMove',
+            'Excel_SheetDelete', 'Excel_SheetList', 'FileCountLines', 'FileCreate',
+            'FileListToArray', 'FileListToArrayRec', 'FilePrint',
+            'FileReadToArray', 'FileWriteFromArray', 'FileWriteLog',
+            'FileWriteToLine', 'FTP_Close', 'FTP_Command', 'FTP_Connect',
+            'FTP_DecodeInternetStatus', 'FTP_DirCreate', 'FTP_DirDelete',
+            'FTP_DirGetCurrent', 'FTP_DirPutContents', 'FTP_DirSetCurrent',
+            'FTP_FileClose', 'FTP_FileDelete', 'FTP_FileGet', 'FTP_FileGetSize',
+            'FTP_FileOpen', 'FTP_FilePut', 'FTP_FileRead', 'FTP_FileRename',
+            'FTP_FileTimeLoHiToStr', 'FTP_FindFileClose', 'FTP_FindFileFirst',
+            'FTP_FindFileNext', 'FTP_GetLastResponseInfo', 'FTP_ListToArray',
+            'FTP_ListToArray2D', 'FTP_ListToArrayEx', 'FTP_Open',
+            'FTP_ProgressDownload', 'FTP_ProgressUpload', 'FTP_SetStatusCallback',
+            'GDIPlus_ArrowCapCreate', 'GDIPlus_ArrowCapDispose',
+            'GDIPlus_ArrowCapGetFillState', 'GDIPlus_ArrowCapGetHeight',
+            'GDIPlus_ArrowCapGetMiddleInset', 'GDIPlus_ArrowCapGetWidth',
+            'GDIPlus_ArrowCapSetFillState', 'GDIPlus_ArrowCapSetHeight',
+            'GDIPlus_ArrowCapSetMiddleInset', 'GDIPlus_ArrowCapSetWidth',
+            'GDIPlus_BitmapApplyEffect', 'GDIPlus_BitmapApplyEffectEx',
+            'GDIPlus_BitmapCloneArea', 'GDIPlus_BitmapConvertFormat',
+            'GDIPlus_BitmapCreateApplyEffect',
+            'GDIPlus_BitmapCreateApplyEffectEx',
+            'GDIPlus_BitmapCreateDIBFromBitmap', 'GDIPlus_BitmapCreateFromFile',
+            'GDIPlus_BitmapCreateFromGraphics',
+            'GDIPlus_BitmapCreateFromHBITMAP', 'GDIPlus_BitmapCreateFromHICON',
+            'GDIPlus_BitmapCreateFromHICON32', 'GDIPlus_BitmapCreateFromMemory',
+            'GDIPlus_BitmapCreateFromResource', 'GDIPlus_BitmapCreateFromScan0',
+            'GDIPlus_BitmapCreateFromStream',
+            'GDIPlus_BitmapCreateHBITMAPFromBitmap', 'GDIPlus_BitmapDispose',
+            'GDIPlus_BitmapGetHistogram', 'GDIPlus_BitmapGetHistogramEx',
+            'GDIPlus_BitmapGetHistogramSize', 'GDIPlus_BitmapGetPixel',
+            'GDIPlus_BitmapLockBits', 'GDIPlus_BitmapSetPixel',
+            'GDIPlus_BitmapUnlockBits', 'GDIPlus_BrushClone',
+            'GDIPlus_BrushCreateSolid', 'GDIPlus_BrushDispose',
+            'GDIPlus_BrushGetSolidColor', 'GDIPlus_BrushGetType',
+            'GDIPlus_BrushSetSolidColor', 'GDIPlus_ColorMatrixCreate',
+            'GDIPlus_ColorMatrixCreateGrayScale',
+            'GDIPlus_ColorMatrixCreateNegative',
+            'GDIPlus_ColorMatrixCreateSaturation',
+            'GDIPlus_ColorMatrixCreateScale',
+            'GDIPlus_ColorMatrixCreateTranslate', 'GDIPlus_CustomLineCapClone',
+            'GDIPlus_CustomLineCapCreate', 'GDIPlus_CustomLineCapDispose',
+            'GDIPlus_CustomLineCapGetStrokeCaps',
+            'GDIPlus_CustomLineCapSetStrokeCaps', 'GDIPlus_Decoders',
+            'GDIPlus_DecodersGetCount', 'GDIPlus_DecodersGetSize',
+            'GDIPlus_DrawImageFX', 'GDIPlus_DrawImageFXEx',
+            'GDIPlus_DrawImagePoints', 'GDIPlus_EffectCreate',
+            'GDIPlus_EffectCreateBlur', 'GDIPlus_EffectCreateBrightnessContrast',
+            'GDIPlus_EffectCreateColorBalance', 'GDIPlus_EffectCreateColorCurve',
+            'GDIPlus_EffectCreateColorLUT', 'GDIPlus_EffectCreateColorMatrix',
+            'GDIPlus_EffectCreateHueSaturationLightness',
+            'GDIPlus_EffectCreateLevels', 'GDIPlus_EffectCreateRedEyeCorrection',
+            'GDIPlus_EffectCreateSharpen', 'GDIPlus_EffectCreateTint',
+            'GDIPlus_EffectDispose', 'GDIPlus_EffectGetParameters',
+            'GDIPlus_EffectSetParameters', 'GDIPlus_Encoders',
+            'GDIPlus_EncodersGetCLSID', 'GDIPlus_EncodersGetCount',
+            'GDIPlus_EncodersGetParamList', 'GDIPlus_EncodersGetParamListSize',
+            'GDIPlus_EncodersGetSize', 'GDIPlus_FontCreate',
+            'GDIPlus_FontDispose', 'GDIPlus_FontFamilyCreate',
+            'GDIPlus_FontFamilyCreateFromCollection',
+            'GDIPlus_FontFamilyDispose', 'GDIPlus_FontFamilyGetCellAscent',
+            'GDIPlus_FontFamilyGetCellDescent', 'GDIPlus_FontFamilyGetEmHeight',
+            'GDIPlus_FontFamilyGetLineSpacing', 'GDIPlus_FontGetHeight',
+            'GDIPlus_FontPrivateAddFont', 'GDIPlus_FontPrivateAddMemoryFont',
+            'GDIPlus_FontPrivateCollectionDispose',
+            'GDIPlus_FontPrivateCreateCollection', 'GDIPlus_GraphicsClear',
+            'GDIPlus_GraphicsCreateFromHDC', 'GDIPlus_GraphicsCreateFromHWND',
+            'GDIPlus_GraphicsDispose', 'GDIPlus_GraphicsDrawArc',
+            'GDIPlus_GraphicsDrawBezier', 'GDIPlus_GraphicsDrawClosedCurve',
+            'GDIPlus_GraphicsDrawClosedCurve2', 'GDIPlus_GraphicsDrawCurve',
+            'GDIPlus_GraphicsDrawCurve2', 'GDIPlus_GraphicsDrawEllipse',
+            'GDIPlus_GraphicsDrawImage', 'GDIPlus_GraphicsDrawImagePointsRect',
+            'GDIPlus_GraphicsDrawImageRect', 'GDIPlus_GraphicsDrawImageRectRect',
+            'GDIPlus_GraphicsDrawLine', 'GDIPlus_GraphicsDrawPath',
+            'GDIPlus_GraphicsDrawPie', 'GDIPlus_GraphicsDrawPolygon',
+            'GDIPlus_GraphicsDrawRect', 'GDIPlus_GraphicsDrawString',
+            'GDIPlus_GraphicsDrawStringEx', 'GDIPlus_GraphicsFillClosedCurve',
+            'GDIPlus_GraphicsFillClosedCurve2', 'GDIPlus_GraphicsFillEllipse',
+            'GDIPlus_GraphicsFillPath', 'GDIPlus_GraphicsFillPie',
+            'GDIPlus_GraphicsFillPolygon', 'GDIPlus_GraphicsFillRect',
+            'GDIPlus_GraphicsFillRegion', 'GDIPlus_GraphicsGetCompositingMode',
+            'GDIPlus_GraphicsGetCompositingQuality', 'GDIPlus_GraphicsGetDC',
+            'GDIPlus_GraphicsGetInterpolationMode',
+            'GDIPlus_GraphicsGetSmoothingMode', 'GDIPlus_GraphicsGetTransform',
+            'GDIPlus_GraphicsMeasureCharacterRanges',
+            'GDIPlus_GraphicsMeasureString', 'GDIPlus_GraphicsReleaseDC',
+            'GDIPlus_GraphicsResetClip', 'GDIPlus_GraphicsResetTransform',
+            'GDIPlus_GraphicsRestore', 'GDIPlus_GraphicsRotateTransform',
+            'GDIPlus_GraphicsSave', 'GDIPlus_GraphicsScaleTransform',
+            'GDIPlus_GraphicsSetClipPath', 'GDIPlus_GraphicsSetClipRect',
+            'GDIPlus_GraphicsSetClipRegion',
+            'GDIPlus_GraphicsSetCompositingMode',
+            'GDIPlus_GraphicsSetCompositingQuality',
+            'GDIPlus_GraphicsSetInterpolationMode',
+            'GDIPlus_GraphicsSetPixelOffsetMode',
+            'GDIPlus_GraphicsSetSmoothingMode',
+            'GDIPlus_GraphicsSetTextRenderingHint',
+            'GDIPlus_GraphicsSetTransform', 'GDIPlus_GraphicsTransformPoints',
+            'GDIPlus_GraphicsTranslateTransform', 'GDIPlus_HatchBrushCreate',
+            'GDIPlus_HICONCreateFromBitmap', 'GDIPlus_ImageAttributesCreate',
+            'GDIPlus_ImageAttributesDispose',
+            'GDIPlus_ImageAttributesSetColorKeys',
+            'GDIPlus_ImageAttributesSetColorMatrix', 'GDIPlus_ImageDispose',
+            'GDIPlus_ImageGetDimension', 'GDIPlus_ImageGetFlags',
+            'GDIPlus_ImageGetGraphicsContext', 'GDIPlus_ImageGetHeight',
+            'GDIPlus_ImageGetHorizontalResolution',
+            'GDIPlus_ImageGetPixelFormat', 'GDIPlus_ImageGetRawFormat',
+            'GDIPlus_ImageGetThumbnail', 'GDIPlus_ImageGetType',
+            'GDIPlus_ImageGetVerticalResolution', 'GDIPlus_ImageGetWidth',
+            'GDIPlus_ImageLoadFromFile', 'GDIPlus_ImageLoadFromStream',
+            'GDIPlus_ImageResize', 'GDIPlus_ImageRotateFlip',
+            'GDIPlus_ImageSaveToFile', 'GDIPlus_ImageSaveToFileEx',
+            'GDIPlus_ImageSaveToStream', 'GDIPlus_ImageScale',
+            'GDIPlus_LineBrushCreate', 'GDIPlus_LineBrushCreateFromRect',
+            'GDIPlus_LineBrushCreateFromRectWithAngle',
+            'GDIPlus_LineBrushGetColors', 'GDIPlus_LineBrushGetRect',
+            'GDIPlus_LineBrushMultiplyTransform',
+            'GDIPlus_LineBrushResetTransform', 'GDIPlus_LineBrushSetBlend',
+            'GDIPlus_LineBrushSetColors', 'GDIPlus_LineBrushSetGammaCorrection',
+            'GDIPlus_LineBrushSetLinearBlend', 'GDIPlus_LineBrushSetPresetBlend',
+            'GDIPlus_LineBrushSetSigmaBlend', 'GDIPlus_LineBrushSetTransform',
+            'GDIPlus_MatrixClone', 'GDIPlus_MatrixCreate',
+            'GDIPlus_MatrixDispose', 'GDIPlus_MatrixGetElements',
+            'GDIPlus_MatrixInvert', 'GDIPlus_MatrixMultiply',
+            'GDIPlus_MatrixRotate', 'GDIPlus_MatrixScale',
+            'GDIPlus_MatrixSetElements', 'GDIPlus_MatrixShear',
+            'GDIPlus_MatrixTransformPoints', 'GDIPlus_MatrixTranslate',
+            'GDIPlus_PaletteInitialize', 'GDIPlus_ParamAdd', 'GDIPlus_ParamInit',
+            'GDIPlus_ParamSize', 'GDIPlus_PathAddArc', 'GDIPlus_PathAddBezier',
+            'GDIPlus_PathAddClosedCurve', 'GDIPlus_PathAddClosedCurve2',
+            'GDIPlus_PathAddCurve', 'GDIPlus_PathAddCurve2',
+            'GDIPlus_PathAddCurve3', 'GDIPlus_PathAddEllipse',
+            'GDIPlus_PathAddLine', 'GDIPlus_PathAddLine2', 'GDIPlus_PathAddPath',
+            'GDIPlus_PathAddPie', 'GDIPlus_PathAddPolygon',
+            'GDIPlus_PathAddRectangle', 'GDIPlus_PathAddString',
+            'GDIPlus_PathBrushCreate', 'GDIPlus_PathBrushCreateFromPath',
+            'GDIPlus_PathBrushGetCenterPoint', 'GDIPlus_PathBrushGetFocusScales',
+            'GDIPlus_PathBrushGetPointCount', 'GDIPlus_PathBrushGetRect',
+            'GDIPlus_PathBrushGetWrapMode', 'GDIPlus_PathBrushMultiplyTransform',
+            'GDIPlus_PathBrushResetTransform', 'GDIPlus_PathBrushSetBlend',
+            'GDIPlus_PathBrushSetCenterColor', 'GDIPlus_PathBrushSetCenterPoint',
+            'GDIPlus_PathBrushSetFocusScales',
+            'GDIPlus_PathBrushSetGammaCorrection',
+            'GDIPlus_PathBrushSetLinearBlend', 'GDIPlus_PathBrushSetPresetBlend',
+            'GDIPlus_PathBrushSetSigmaBlend',
+            'GDIPlus_PathBrushSetSurroundColor',
+            'GDIPlus_PathBrushSetSurroundColorsWithCount',
+            'GDIPlus_PathBrushSetTransform', 'GDIPlus_PathBrushSetWrapMode',
+            'GDIPlus_PathClone', 'GDIPlus_PathCloseFigure', 'GDIPlus_PathCreate',
+            'GDIPlus_PathCreate2', 'GDIPlus_PathDispose', 'GDIPlus_PathFlatten',
+            'GDIPlus_PathGetData', 'GDIPlus_PathGetFillMode',
+            'GDIPlus_PathGetLastPoint', 'GDIPlus_PathGetPointCount',
+            'GDIPlus_PathGetPoints', 'GDIPlus_PathGetWorldBounds',
+            'GDIPlus_PathIsOutlineVisiblePoint', 'GDIPlus_PathIsVisiblePoint',
+            'GDIPlus_PathIterCreate', 'GDIPlus_PathIterDispose',
+            'GDIPlus_PathIterGetSubpathCount', 'GDIPlus_PathIterNextMarkerPath',
+            'GDIPlus_PathIterNextSubpathPath', 'GDIPlus_PathIterRewind',
+            'GDIPlus_PathReset', 'GDIPlus_PathReverse', 'GDIPlus_PathSetFillMode',
+            'GDIPlus_PathSetMarker', 'GDIPlus_PathStartFigure',
+            'GDIPlus_PathTransform', 'GDIPlus_PathWarp', 'GDIPlus_PathWiden',
+            'GDIPlus_PathWindingModeOutline', 'GDIPlus_PenCreate',
+            'GDIPlus_PenCreate2', 'GDIPlus_PenDispose', 'GDIPlus_PenGetAlignment',
+            'GDIPlus_PenGetColor', 'GDIPlus_PenGetCustomEndCap',
+            'GDIPlus_PenGetDashCap', 'GDIPlus_PenGetDashStyle',
+            'GDIPlus_PenGetEndCap', 'GDIPlus_PenGetMiterLimit',
+            'GDIPlus_PenGetWidth', 'GDIPlus_PenSetAlignment',
+            'GDIPlus_PenSetColor', 'GDIPlus_PenSetCustomEndCap',
+            'GDIPlus_PenSetDashCap', 'GDIPlus_PenSetDashStyle',
+            'GDIPlus_PenSetEndCap', 'GDIPlus_PenSetLineCap',
+            'GDIPlus_PenSetLineJoin', 'GDIPlus_PenSetMiterLimit',
+            'GDIPlus_PenSetStartCap', 'GDIPlus_PenSetWidth',
+            'GDIPlus_RectFCreate', 'GDIPlus_RegionClone',
+            'GDIPlus_RegionCombinePath', 'GDIPlus_RegionCombineRect',
+            'GDIPlus_RegionCombineRegion', 'GDIPlus_RegionCreate',
+            'GDIPlus_RegionCreateFromPath', 'GDIPlus_RegionCreateFromRect',
+            'GDIPlus_RegionDispose', 'GDIPlus_RegionGetBounds',
+            'GDIPlus_RegionGetHRgn', 'GDIPlus_RegionTransform',
+            'GDIPlus_RegionTranslate', 'GDIPlus_Shutdown', 'GDIPlus_Startup',
+            'GDIPlus_StringFormatCreate', 'GDIPlus_StringFormatDispose',
+            'GDIPlus_StringFormatGetMeasurableCharacterRangeCount',
+            'GDIPlus_StringFormatSetAlign', 'GDIPlus_StringFormatSetLineAlign',
+            'GDIPlus_StringFormatSetMeasurableCharacterRanges',
+            'GDIPlus_TextureCreate', 'GDIPlus_TextureCreate2',
+            'GDIPlus_TextureCreateIA', 'GetIP', 'GUICtrlAVI_Close',
+            'GUICtrlAVI_Create', 'GUICtrlAVI_Destroy', 'GUICtrlAVI_IsPlaying',
+            'GUICtrlAVI_Open', 'GUICtrlAVI_OpenEx', 'GUICtrlAVI_Play',
+            'GUICtrlAVI_Seek', 'GUICtrlAVI_Show', 'GUICtrlAVI_Stop',
+            'GUICtrlButton_Click', 'GUICtrlButton_Create',
+            'GUICtrlButton_Destroy', 'GUICtrlButton_Enable',
+            'GUICtrlButton_GetCheck', 'GUICtrlButton_GetFocus',
+            'GUICtrlButton_GetIdealSize', 'GUICtrlButton_GetImage',
+            'GUICtrlButton_GetImageList', 'GUICtrlButton_GetNote',
+            'GUICtrlButton_GetNoteLength', 'GUICtrlButton_GetSplitInfo',
+            'GUICtrlButton_GetState', 'GUICtrlButton_GetText',
+            'GUICtrlButton_GetTextMargin', 'GUICtrlButton_SetCheck',
+            'GUICtrlButton_SetDontClick', 'GUICtrlButton_SetFocus',
+            'GUICtrlButton_SetImage', 'GUICtrlButton_SetImageList',
+            'GUICtrlButton_SetNote', 'GUICtrlButton_SetShield',
+            'GUICtrlButton_SetSize', 'GUICtrlButton_SetSplitInfo',
+            'GUICtrlButton_SetState', 'GUICtrlButton_SetStyle',
+            'GUICtrlButton_SetText', 'GUICtrlButton_SetTextMargin',
+            'GUICtrlButton_Show', 'GUICtrlComboBoxEx_AddDir',
+            'GUICtrlComboBoxEx_AddString', 'GUICtrlComboBoxEx_BeginUpdate',
+            'GUICtrlComboBoxEx_Create', 'GUICtrlComboBoxEx_CreateSolidBitMap',
+            'GUICtrlComboBoxEx_DeleteString', 'GUICtrlComboBoxEx_Destroy',
+            'GUICtrlComboBoxEx_EndUpdate', 'GUICtrlComboBoxEx_FindStringExact',
             'GUICtrlComboBoxEx_GetComboBoxInfo',
-            'GUICtrlComboBoxEx_GetComboControl','GUICtrlComboBoxEx_GetCount',
+            'GUICtrlComboBoxEx_GetComboControl', 'GUICtrlComboBoxEx_GetCount',
             'GUICtrlComboBoxEx_GetCurSel',
             'GUICtrlComboBoxEx_GetDroppedControlRect',
             'GUICtrlComboBoxEx_GetDroppedControlRectEx',
             'GUICtrlComboBoxEx_GetDroppedState',
             'GUICtrlComboBoxEx_GetDroppedWidth',
-            'GUICtrlComboBoxEx_GetEditControl','GUICtrlComboBoxEx_GetEditSel',
+            'GUICtrlComboBoxEx_GetEditControl', 'GUICtrlComboBoxEx_GetEditSel',
             'GUICtrlComboBoxEx_GetEditText',
             'GUICtrlComboBoxEx_GetExtendedStyle',
-            'GUICtrlComboBoxEx_GetExtendedUI','GUICtrlComboBoxEx_GetImageList',
-            'GUICtrlComboBoxEx_GetItem','GUICtrlComboBoxEx_GetItemEx',
-            'GUICtrlComboBoxEx_GetItemHeight','GUICtrlComboBoxEx_GetItemImage',
+            'GUICtrlComboBoxEx_GetExtendedUI', 'GUICtrlComboBoxEx_GetImageList',
+            'GUICtrlComboBoxEx_GetItem', 'GUICtrlComboBoxEx_GetItemEx',
+            'GUICtrlComboBoxEx_GetItemHeight', 'GUICtrlComboBoxEx_GetItemImage',
             'GUICtrlComboBoxEx_GetItemIndent',
             'GUICtrlComboBoxEx_GetItemOverlayImage',
             'GUICtrlComboBoxEx_GetItemParam',
             'GUICtrlComboBoxEx_GetItemSelectedImage',
-            'GUICtrlComboBoxEx_GetItemText','GUICtrlComboBoxEx_GetItemTextLen',
-            'GUICtrlComboBoxEx_GetList','GUICtrlComboBoxEx_GetListArray',
-            'GUICtrlComboBoxEx_GetLocale','GUICtrlComboBoxEx_GetLocaleCountry',
+            'GUICtrlComboBoxEx_GetItemText', 'GUICtrlComboBoxEx_GetItemTextLen',
+            'GUICtrlComboBoxEx_GetList', 'GUICtrlComboBoxEx_GetListArray',
+            'GUICtrlComboBoxEx_GetLocale', 'GUICtrlComboBoxEx_GetLocaleCountry',
             'GUICtrlComboBoxEx_GetLocaleLang',
             'GUICtrlComboBoxEx_GetLocalePrimLang',
             'GUICtrlComboBoxEx_GetLocaleSubLang',
-            'GUICtrlComboBoxEx_GetMinVisible','GUICtrlComboBoxEx_GetTopIndex',
-            'GUICtrlComboBoxEx_InitStorage','GUICtrlComboBoxEx_InsertString',
-            'GUICtrlComboBoxEx_LimitText','GUICtrlComboBoxEx_ReplaceEditSel',
-            'GUICtrlComboBoxEx_ResetContent','GUICtrlComboBoxEx_SetCurSel',
-            'GUICtrlComboBoxEx_SetDroppedWidth','GUICtrlComboBoxEx_SetEditSel',
-            'GUICtrlComboBoxEx_SetEditText',
+            'GUICtrlComboBoxEx_GetMinVisible', 'GUICtrlComboBoxEx_GetTopIndex',
+            'GUICtrlComboBoxEx_GetUnicode', 'GUICtrlComboBoxEx_InitStorage',
+            'GUICtrlComboBoxEx_InsertString', 'GUICtrlComboBoxEx_LimitText',
+            'GUICtrlComboBoxEx_ReplaceEditSel', 'GUICtrlComboBoxEx_ResetContent',
+            'GUICtrlComboBoxEx_SetCurSel', 'GUICtrlComboBoxEx_SetDroppedWidth',
+            'GUICtrlComboBoxEx_SetEditSel', 'GUICtrlComboBoxEx_SetEditText',
             'GUICtrlComboBoxEx_SetExtendedStyle',
-            'GUICtrlComboBoxEx_SetExtendedUI','GUICtrlComboBoxEx_SetImageList',
-            'GUICtrlComboBoxEx_SetItem','GUICtrlComboBoxEx_SetItemEx',
-            'GUICtrlComboBoxEx_SetItemHeight','GUICtrlComboBoxEx_SetItemImage',
+            'GUICtrlComboBoxEx_SetExtendedUI', 'GUICtrlComboBoxEx_SetImageList',
+            'GUICtrlComboBoxEx_SetItem', 'GUICtrlComboBoxEx_SetItemEx',
+            'GUICtrlComboBoxEx_SetItemHeight', 'GUICtrlComboBoxEx_SetItemImage',
             'GUICtrlComboBoxEx_SetItemIndent',
             'GUICtrlComboBoxEx_SetItemOverlayImage',
             'GUICtrlComboBoxEx_SetItemParam',
             'GUICtrlComboBoxEx_SetItemSelectedImage',
-            'GUICtrlComboBoxEx_SetMinVisible','GUICtrlComboBoxEx_SetTopIndex',
-            'GUICtrlComboBoxEx_ShowDropDown','GUICtrlDTP_Create',
-            'GUICtrlDTP_Destroy','GUICtrlDTP_GetMCColor','GUICtrlDTP_GetMCFont',
-            'GUICtrlDTP_GetMonthCal','GUICtrlDTP_GetRange',
-            'GUICtrlDTP_GetRangeEx','GUICtrlDTP_GetSystemTime',
-            'GUICtrlDTP_GetSystemTimeEx','GUICtrlDTP_SetFormat',
-            'GUICtrlDTP_SetMCColor','GUICtrlDTP_SetMCFont',
-            'GUICtrlDTP_SetRange','GUICtrlDTP_SetRangeEx',
-            'GUICtrlDTP_SetSystemTime','GUICtrlDTP_SetSystemTimeEx',
-            'GUICtrlEdit_AppendText','GUICtrlEdit_BeginUpdate',
-            'GUICtrlEdit_CanUndo','GUICtrlEdit_CharFromPos',
-            'GUICtrlEdit_Create','GUICtrlEdit_Destroy',
-            'GUICtrlEdit_EmptyUndoBuffer','GUICtrlEdit_EndUpdate',
-            'GUICtrlEdit_Find','GUICtrlEdit_FmtLines',
-            'GUICtrlEdit_GetFirstVisibleLine','GUICtrlEdit_GetLimitText',
-            'GUICtrlEdit_GetLine','GUICtrlEdit_GetLineCount',
-            'GUICtrlEdit_GetMargins','GUICtrlEdit_GetModify',
-            'GUICtrlEdit_GetPasswordChar','GUICtrlEdit_GetRECT',
-            'GUICtrlEdit_GetRECTEx','GUICtrlEdit_GetSel','GUICtrlEdit_GetText',
-            'GUICtrlEdit_GetTextLen','GUICtrlEdit_HideBalloonTip',
-            'GUICtrlEdit_InsertText','GUICtrlEdit_LineFromChar',
-            'GUICtrlEdit_LineIndex','GUICtrlEdit_LineLength',
-            'GUICtrlEdit_LineScroll','GUICtrlEdit_PosFromChar',
-            'GUICtrlEdit_ReplaceSel','GUICtrlEdit_Scroll',
-            'GUICtrlEdit_SetLimitText','GUICtrlEdit_SetMargins',
-            'GUICtrlEdit_SetModify','GUICtrlEdit_SetPasswordChar',
-            'GUICtrlEdit_SetReadOnly','GUICtrlEdit_SetRECT',
-            'GUICtrlEdit_SetRECTEx','GUICtrlEdit_SetRECTNP',
-            'GUICtrlEdit_SetRectNPEx','GUICtrlEdit_SetSel',
-            'GUICtrlEdit_SetTabStops','GUICtrlEdit_SetText',
-            'GUICtrlEdit_ShowBalloonTip','GUICtrlEdit_Undo',
-            'GUICtrlHeader_AddItem','GUICtrlHeader_ClearFilter',
-            'GUICtrlHeader_ClearFilterAll','GUICtrlHeader_Create',
-            'GUICtrlHeader_CreateDragImage','GUICtrlHeader_DeleteItem',
-            'GUICtrlHeader_Destroy','GUICtrlHeader_EditFilter',
-            'GUICtrlHeader_GetBitmapMargin','GUICtrlHeader_GetImageList',
-            'GUICtrlHeader_GetItem','GUICtrlHeader_GetItemAlign',
-            'GUICtrlHeader_GetItemBitmap','GUICtrlHeader_GetItemCount',
-            'GUICtrlHeader_GetItemDisplay','GUICtrlHeader_GetItemFlags',
-            'GUICtrlHeader_GetItemFormat','GUICtrlHeader_GetItemImage',
-            'GUICtrlHeader_GetItemOrder','GUICtrlHeader_GetItemParam',
-            'GUICtrlHeader_GetItemRect','GUICtrlHeader_GetItemRectEx',
-            'GUICtrlHeader_GetItemText','GUICtrlHeader_GetItemWidth',
-            'GUICtrlHeader_GetOrderArray','GUICtrlHeader_GetUnicodeFormat',
-            'GUICtrlHeader_HitTest','GUICtrlHeader_InsertItem',
-            'GUICtrlHeader_Layout','GUICtrlHeader_OrderToIndex',
+            'GUICtrlComboBoxEx_SetMinVisible', 'GUICtrlComboBoxEx_SetTopIndex',
+            'GUICtrlComboBoxEx_SetUnicode', 'GUICtrlComboBoxEx_ShowDropDown',
+            'GUICtrlComboBox_AddDir', 'GUICtrlComboBox_AddString',
+            'GUICtrlComboBox_AutoComplete', 'GUICtrlComboBox_BeginUpdate',
+            'GUICtrlComboBox_Create', 'GUICtrlComboBox_DeleteString',
+            'GUICtrlComboBox_Destroy', 'GUICtrlComboBox_EndUpdate',
+            'GUICtrlComboBox_FindString', 'GUICtrlComboBox_FindStringExact',
+            'GUICtrlComboBox_GetComboBoxInfo', 'GUICtrlComboBox_GetCount',
+            'GUICtrlComboBox_GetCueBanner', 'GUICtrlComboBox_GetCurSel',
+            'GUICtrlComboBox_GetDroppedControlRect',
+            'GUICtrlComboBox_GetDroppedControlRectEx',
+            'GUICtrlComboBox_GetDroppedState', 'GUICtrlComboBox_GetDroppedWidth',
+            'GUICtrlComboBox_GetEditSel', 'GUICtrlComboBox_GetEditText',
+            'GUICtrlComboBox_GetExtendedUI',
+            'GUICtrlComboBox_GetHorizontalExtent',
+            'GUICtrlComboBox_GetItemHeight', 'GUICtrlComboBox_GetLBText',
+            'GUICtrlComboBox_GetLBTextLen', 'GUICtrlComboBox_GetList',
+            'GUICtrlComboBox_GetListArray', 'GUICtrlComboBox_GetLocale',
+            'GUICtrlComboBox_GetLocaleCountry', 'GUICtrlComboBox_GetLocaleLang',
+            'GUICtrlComboBox_GetLocalePrimLang',
+            'GUICtrlComboBox_GetLocaleSubLang', 'GUICtrlComboBox_GetMinVisible',
+            'GUICtrlComboBox_GetTopIndex', 'GUICtrlComboBox_InitStorage',
+            'GUICtrlComboBox_InsertString', 'GUICtrlComboBox_LimitText',
+            'GUICtrlComboBox_ReplaceEditSel', 'GUICtrlComboBox_ResetContent',
+            'GUICtrlComboBox_SelectString', 'GUICtrlComboBox_SetCueBanner',
+            'GUICtrlComboBox_SetCurSel', 'GUICtrlComboBox_SetDroppedWidth',
+            'GUICtrlComboBox_SetEditSel', 'GUICtrlComboBox_SetEditText',
+            'GUICtrlComboBox_SetExtendedUI',
+            'GUICtrlComboBox_SetHorizontalExtent',
+            'GUICtrlComboBox_SetItemHeight', 'GUICtrlComboBox_SetMinVisible',
+            'GUICtrlComboBox_SetTopIndex', 'GUICtrlComboBox_ShowDropDown',
+            'GUICtrlDTP_Create', 'GUICtrlDTP_Destroy', 'GUICtrlDTP_GetMCColor',
+            'GUICtrlDTP_GetMCFont', 'GUICtrlDTP_GetMonthCal',
+            'GUICtrlDTP_GetRange', 'GUICtrlDTP_GetRangeEx',
+            'GUICtrlDTP_GetSystemTime', 'GUICtrlDTP_GetSystemTimeEx',
+            'GUICtrlDTP_SetFormat', 'GUICtrlDTP_SetMCColor',
+            'GUICtrlDTP_SetMCFont', 'GUICtrlDTP_SetRange',
+            'GUICtrlDTP_SetRangeEx', 'GUICtrlDTP_SetSystemTime',
+            'GUICtrlDTP_SetSystemTimeEx', 'GUICtrlEdit_AppendText',
+            'GUICtrlEdit_BeginUpdate', 'GUICtrlEdit_CanUndo',
+            'GUICtrlEdit_CharFromPos', 'GUICtrlEdit_Create',
+            'GUICtrlEdit_Destroy', 'GUICtrlEdit_EmptyUndoBuffer',
+            'GUICtrlEdit_EndUpdate', 'GUICtrlEdit_Find', 'GUICtrlEdit_FmtLines',
+            'GUICtrlEdit_GetCueBanner', 'GUICtrlEdit_GetFirstVisibleLine',
+            'GUICtrlEdit_GetLimitText', 'GUICtrlEdit_GetLine',
+            'GUICtrlEdit_GetLineCount', 'GUICtrlEdit_GetMargins',
+            'GUICtrlEdit_GetModify', 'GUICtrlEdit_GetPasswordChar',
+            'GUICtrlEdit_GetRECT', 'GUICtrlEdit_GetRECTEx', 'GUICtrlEdit_GetSel',
+            'GUICtrlEdit_GetText', 'GUICtrlEdit_GetTextLen',
+            'GUICtrlEdit_HideBalloonTip', 'GUICtrlEdit_InsertText',
+            'GUICtrlEdit_LineFromChar', 'GUICtrlEdit_LineIndex',
+            'GUICtrlEdit_LineLength', 'GUICtrlEdit_LineScroll',
+            'GUICtrlEdit_PosFromChar', 'GUICtrlEdit_ReplaceSel',
+            'GUICtrlEdit_Scroll', 'GUICtrlEdit_SetCueBanner',
+            'GUICtrlEdit_SetLimitText', 'GUICtrlEdit_SetMargins',
+            'GUICtrlEdit_SetModify', 'GUICtrlEdit_SetPasswordChar',
+            'GUICtrlEdit_SetReadOnly', 'GUICtrlEdit_SetRECT',
+            'GUICtrlEdit_SetRECTEx', 'GUICtrlEdit_SetRECTNP',
+            'GUICtrlEdit_SetRectNPEx', 'GUICtrlEdit_SetSel',
+            'GUICtrlEdit_SetTabStops', 'GUICtrlEdit_SetText',
+            'GUICtrlEdit_ShowBalloonTip', 'GUICtrlEdit_Undo',
+            'GUICtrlHeader_AddItem', 'GUICtrlHeader_ClearFilter',
+            'GUICtrlHeader_ClearFilterAll', 'GUICtrlHeader_Create',
+            'GUICtrlHeader_CreateDragImage', 'GUICtrlHeader_DeleteItem',
+            'GUICtrlHeader_Destroy', 'GUICtrlHeader_EditFilter',
+            'GUICtrlHeader_GetBitmapMargin', 'GUICtrlHeader_GetImageList',
+            'GUICtrlHeader_GetItem', 'GUICtrlHeader_GetItemAlign',
+            'GUICtrlHeader_GetItemBitmap', 'GUICtrlHeader_GetItemCount',
+            'GUICtrlHeader_GetItemDisplay', 'GUICtrlHeader_GetItemFlags',
+            'GUICtrlHeader_GetItemFormat', 'GUICtrlHeader_GetItemImage',
+            'GUICtrlHeader_GetItemOrder', 'GUICtrlHeader_GetItemParam',
+            'GUICtrlHeader_GetItemRect', 'GUICtrlHeader_GetItemRectEx',
+            'GUICtrlHeader_GetItemText', 'GUICtrlHeader_GetItemWidth',
+            'GUICtrlHeader_GetOrderArray', 'GUICtrlHeader_GetUnicodeFormat',
+            'GUICtrlHeader_HitTest', 'GUICtrlHeader_InsertItem',
+            'GUICtrlHeader_Layout', 'GUICtrlHeader_OrderToIndex',
             'GUICtrlHeader_SetBitmapMargin',
             'GUICtrlHeader_SetFilterChangeTimeout',
-            'GUICtrlHeader_SetHotDivider','GUICtrlHeader_SetImageList',
-            'GUICtrlHeader_SetItem','GUICtrlHeader_SetItemAlign',
-            'GUICtrlHeader_SetItemBitmap','GUICtrlHeader_SetItemDisplay',
-            'GUICtrlHeader_SetItemFlags','GUICtrlHeader_SetItemFormat',
-            'GUICtrlHeader_SetItemImage','GUICtrlHeader_SetItemOrder',
-            'GUICtrlHeader_SetItemParam','GUICtrlHeader_SetItemText',
-            'GUICtrlHeader_SetItemWidth','GUICtrlHeader_SetOrderArray',
-            'GUICtrlHeader_SetUnicodeFormat','GUICtrlIpAddress_ClearAddress',
-            'GUICtrlIpAddress_Create','GUICtrlIpAddress_Destroy',
-            'GUICtrlIpAddress_Get','GUICtrlIpAddress_GetArray',
-            'GUICtrlIpAddress_GetEx','GUICtrlIpAddress_IsBlank',
-            'GUICtrlIpAddress_Set','GUICtrlIpAddress_SetArray',
-            'GUICtrlIpAddress_SetEx','GUICtrlIpAddress_SetFocus',
-            'GUICtrlIpAddress_SetFont','GUICtrlIpAddress_SetRange',
-            'GUICtrlIpAddress_ShowHide','GUICtrlListBox_AddFile',
-            'GUICtrlListBox_AddString','GUICtrlListBox_BeginUpdate',
-            'GUICtrlListBox_Create','GUICtrlListBox_DeleteString',
-            'GUICtrlListBox_Destroy','GUICtrlListBox_Dir',
-            'GUICtrlListBox_EndUpdate','GUICtrlListBox_FindInText',
-            'GUICtrlListBox_FindString','GUICtrlListBox_GetAnchorIndex',
-            'GUICtrlListBox_GetCaretIndex','GUICtrlListBox_GetCount',
-            'GUICtrlListBox_GetCurSel','GUICtrlListBox_GetHorizontalExtent',
-            'GUICtrlListBox_GetItemData','GUICtrlListBox_GetItemHeight',
-            'GUICtrlListBox_GetItemRect','GUICtrlListBox_GetItemRectEx',
-            'GUICtrlListBox_GetListBoxInfo','GUICtrlListBox_GetLocale',
-            'GUICtrlListBox_GetLocaleCountry','GUICtrlListBox_GetLocaleLang',
-            'GUICtrlListBox_GetLocalePrimLang',
-            'GUICtrlListBox_GetLocaleSubLang','GUICtrlListBox_GetSel',
-            'GUICtrlListBox_GetSelCount','GUICtrlListBox_GetSelItems',
-            'GUICtrlListBox_GetSelItemsText','GUICtrlListBox_GetText',
-            'GUICtrlListBox_GetTextLen','GUICtrlListBox_GetTopIndex',
-            'GUICtrlListBox_InitStorage','GUICtrlListBox_InsertString',
-            'GUICtrlListBox_ItemFromPoint','GUICtrlListBox_ReplaceString',
-            'GUICtrlListBox_ResetContent','GUICtrlListBox_SelectString',
-            'GUICtrlListBox_SelItemRange','GUICtrlListBox_SelItemRangeEx',
-            'GUICtrlListBox_SetAnchorIndex','GUICtrlListBox_SetCaretIndex',
-            'GUICtrlListBox_SetColumnWidth','GUICtrlListBox_SetCurSel',
-            'GUICtrlListBox_SetHorizontalExtent','GUICtrlListBox_SetItemData',
-            'GUICtrlListBox_SetItemHeight','GUICtrlListBox_SetLocale',
-            'GUICtrlListBox_SetSel','GUICtrlListBox_SetTabStops',
-            'GUICtrlListBox_SetTopIndex','GUICtrlListBox_Sort',
-            'GUICtrlListBox_SwapString','GUICtrlListBox_UpdateHScroll',
-            'GUICtrlListView_AddArray','GUICtrlListView_AddColumn',
-            'GUICtrlListView_AddItem','GUICtrlListView_AddSubItem',
+            'GUICtrlHeader_SetHotDivider', 'GUICtrlHeader_SetImageList',
+            'GUICtrlHeader_SetItem', 'GUICtrlHeader_SetItemAlign',
+            'GUICtrlHeader_SetItemBitmap', 'GUICtrlHeader_SetItemDisplay',
+            'GUICtrlHeader_SetItemFlags', 'GUICtrlHeader_SetItemFormat',
+            'GUICtrlHeader_SetItemImage', 'GUICtrlHeader_SetItemOrder',
+            'GUICtrlHeader_SetItemParam', 'GUICtrlHeader_SetItemText',
+            'GUICtrlHeader_SetItemWidth', 'GUICtrlHeader_SetOrderArray',
+            'GUICtrlHeader_SetUnicodeFormat', 'GUICtrlIpAddress_ClearAddress',
+            'GUICtrlIpAddress_Create', 'GUICtrlIpAddress_Destroy',
+            'GUICtrlIpAddress_Get', 'GUICtrlIpAddress_GetArray',
+            'GUICtrlIpAddress_GetEx', 'GUICtrlIpAddress_IsBlank',
+            'GUICtrlIpAddress_Set', 'GUICtrlIpAddress_SetArray',
+            'GUICtrlIpAddress_SetEx', 'GUICtrlIpAddress_SetFocus',
+            'GUICtrlIpAddress_SetFont', 'GUICtrlIpAddress_SetRange',
+            'GUICtrlIpAddress_ShowHide', 'GUICtrlListBox_AddFile',
+            'GUICtrlListBox_AddString', 'GUICtrlListBox_BeginUpdate',
+            'GUICtrlListBox_ClickItem', 'GUICtrlListBox_Create',
+            'GUICtrlListBox_DeleteString', 'GUICtrlListBox_Destroy',
+            'GUICtrlListBox_Dir', 'GUICtrlListBox_EndUpdate',
+            'GUICtrlListBox_FindInText', 'GUICtrlListBox_FindString',
+            'GUICtrlListBox_GetAnchorIndex', 'GUICtrlListBox_GetCaretIndex',
+            'GUICtrlListBox_GetCount', 'GUICtrlListBox_GetCurSel',
+            'GUICtrlListBox_GetHorizontalExtent', 'GUICtrlListBox_GetItemData',
+            'GUICtrlListBox_GetItemHeight', 'GUICtrlListBox_GetItemRect',
+            'GUICtrlListBox_GetItemRectEx', 'GUICtrlListBox_GetListBoxInfo',
+            'GUICtrlListBox_GetLocale', 'GUICtrlListBox_GetLocaleCountry',
+            'GUICtrlListBox_GetLocaleLang', 'GUICtrlListBox_GetLocalePrimLang',
+            'GUICtrlListBox_GetLocaleSubLang', 'GUICtrlListBox_GetSel',
+            'GUICtrlListBox_GetSelCount', 'GUICtrlListBox_GetSelItems',
+            'GUICtrlListBox_GetSelItemsText', 'GUICtrlListBox_GetText',
+            'GUICtrlListBox_GetTextLen', 'GUICtrlListBox_GetTopIndex',
+            'GUICtrlListBox_InitStorage', 'GUICtrlListBox_InsertString',
+            'GUICtrlListBox_ItemFromPoint', 'GUICtrlListBox_ReplaceString',
+            'GUICtrlListBox_ResetContent', 'GUICtrlListBox_SelectString',
+            'GUICtrlListBox_SelItemRange', 'GUICtrlListBox_SelItemRangeEx',
+            'GUICtrlListBox_SetAnchorIndex', 'GUICtrlListBox_SetCaretIndex',
+            'GUICtrlListBox_SetColumnWidth', 'GUICtrlListBox_SetCurSel',
+            'GUICtrlListBox_SetHorizontalExtent', 'GUICtrlListBox_SetItemData',
+            'GUICtrlListBox_SetItemHeight', 'GUICtrlListBox_SetLocale',
+            'GUICtrlListBox_SetSel', 'GUICtrlListBox_SetTabStops',
+            'GUICtrlListBox_SetTopIndex', 'GUICtrlListBox_Sort',
+            'GUICtrlListBox_SwapString', 'GUICtrlListBox_UpdateHScroll',
+            'GUICtrlListView_AddArray', 'GUICtrlListView_AddColumn',
+            'GUICtrlListView_AddItem', 'GUICtrlListView_AddSubItem',
             'GUICtrlListView_ApproximateViewHeight',
             'GUICtrlListView_ApproximateViewRect',
-            'GUICtrlListView_ApproximateViewWidth','GUICtrlListView_Arrange',
-            'GUICtrlListView_BeginUpdate','GUICtrlListView_CancelEditLabel',
-            'GUICtrlListView_ClickItem','GUICtrlListView_CopyItems',
-            'GUICtrlListView_Create','GUICtrlListView_CreateDragImage',
+            'GUICtrlListView_ApproximateViewWidth', 'GUICtrlListView_Arrange',
+            'GUICtrlListView_BeginUpdate', 'GUICtrlListView_CancelEditLabel',
+            'GUICtrlListView_ClickItem', 'GUICtrlListView_CopyItems',
+            'GUICtrlListView_Create', 'GUICtrlListView_CreateDragImage',
             'GUICtrlListView_CreateSolidBitMap',
-            'GUICtrlListView_DeleteAllItems','GUICtrlListView_DeleteColumn',
-            'GUICtrlListView_DeleteItem','GUICtrlListView_DeleteItemsSelected',
-            'GUICtrlListView_Destroy','GUICtrlListView_DrawDragImage',
-            'GUICtrlListView_EditLabel','GUICtrlListView_EnableGroupView',
-            'GUICtrlListView_EndUpdate','GUICtrlListView_EnsureVisible',
-            'GUICtrlListView_FindInText','GUICtrlListView_FindItem',
-            'GUICtrlListView_FindNearest','GUICtrlListView_FindParam',
-            'GUICtrlListView_FindText','GUICtrlListView_GetBkColor',
-            'GUICtrlListView_GetBkImage','GUICtrlListView_GetCallbackMask',
-            'GUICtrlListView_GetColumn','GUICtrlListView_GetColumnCount',
+            'GUICtrlListView_DeleteAllItems', 'GUICtrlListView_DeleteColumn',
+            'GUICtrlListView_DeleteItem', 'GUICtrlListView_DeleteItemsSelected',
+            'GUICtrlListView_Destroy', 'GUICtrlListView_DrawDragImage',
+            'GUICtrlListView_EditLabel', 'GUICtrlListView_EnableGroupView',
+            'GUICtrlListView_EndUpdate', 'GUICtrlListView_EnsureVisible',
+            'GUICtrlListView_FindInText', 'GUICtrlListView_FindItem',
+            'GUICtrlListView_FindNearest', 'GUICtrlListView_FindParam',
+            'GUICtrlListView_FindText', 'GUICtrlListView_GetBkColor',
+            'GUICtrlListView_GetBkImage', 'GUICtrlListView_GetCallbackMask',
+            'GUICtrlListView_GetColumn', 'GUICtrlListView_GetColumnCount',
             'GUICtrlListView_GetColumnOrder',
             'GUICtrlListView_GetColumnOrderArray',
-            'GUICtrlListView_GetColumnWidth','GUICtrlListView_GetCounterPage',
+            'GUICtrlListView_GetColumnWidth', 'GUICtrlListView_GetCounterPage',
             'GUICtrlListView_GetEditControl',
             'GUICtrlListView_GetExtendedListViewStyle',
+            'GUICtrlListView_GetFocusedGroup', 'GUICtrlListView_GetGroupCount',
             'GUICtrlListView_GetGroupInfo',
-            'GUICtrlListView_GetGroupViewEnabled','GUICtrlListView_GetHeader',
-            'GUICtrlListView_GetHotCursor','GUICtrlListView_GetHotItem',
-            'GUICtrlListView_GetHoverTime','GUICtrlListView_GetImageList',
-            'GUICtrlListView_GetISearchString','GUICtrlListView_GetItem',
-            'GUICtrlListView_GetItemChecked','GUICtrlListView_GetItemCount',
-            'GUICtrlListView_GetItemCut','GUICtrlListView_GetItemDropHilited',
-            'GUICtrlListView_GetItemEx','GUICtrlListView_GetItemFocused',
-            'GUICtrlListView_GetItemGroupID','GUICtrlListView_GetItemImage',
-            'GUICtrlListView_GetItemIndent','GUICtrlListView_GetItemParam',
+            'GUICtrlListView_GetGroupInfoByIndex',
+            'GUICtrlListView_GetGroupRect',
+            'GUICtrlListView_GetGroupViewEnabled', 'GUICtrlListView_GetHeader',
+            'GUICtrlListView_GetHotCursor', 'GUICtrlListView_GetHotItem',
+            'GUICtrlListView_GetHoverTime', 'GUICtrlListView_GetImageList',
+            'GUICtrlListView_GetISearchString', 'GUICtrlListView_GetItem',
+            'GUICtrlListView_GetItemChecked', 'GUICtrlListView_GetItemCount',
+            'GUICtrlListView_GetItemCut', 'GUICtrlListView_GetItemDropHilited',
+            'GUICtrlListView_GetItemEx', 'GUICtrlListView_GetItemFocused',
+            'GUICtrlListView_GetItemGroupID', 'GUICtrlListView_GetItemImage',
+            'GUICtrlListView_GetItemIndent', 'GUICtrlListView_GetItemParam',
             'GUICtrlListView_GetItemPosition',
             'GUICtrlListView_GetItemPositionX',
-            'GUICtrlListView_GetItemPositionY','GUICtrlListView_GetItemRect',
-            'GUICtrlListView_GetItemRectEx','GUICtrlListView_GetItemSelected',
-            'GUICtrlListView_GetItemSpacing','GUICtrlListView_GetItemSpacingX',
-            'GUICtrlListView_GetItemSpacingY','GUICtrlListView_GetItemState',
-            'GUICtrlListView_GetItemStateImage','GUICtrlListView_GetItemText',
+            'GUICtrlListView_GetItemPositionY', 'GUICtrlListView_GetItemRect',
+            'GUICtrlListView_GetItemRectEx', 'GUICtrlListView_GetItemSelected',
+            'GUICtrlListView_GetItemSpacing', 'GUICtrlListView_GetItemSpacingX',
+            'GUICtrlListView_GetItemSpacingY', 'GUICtrlListView_GetItemState',
+            'GUICtrlListView_GetItemStateImage', 'GUICtrlListView_GetItemText',
             'GUICtrlListView_GetItemTextArray',
-            'GUICtrlListView_GetItemTextString','GUICtrlListView_GetNextItem',
-            'GUICtrlListView_GetNumberOfWorkAreas','GUICtrlListView_GetOrigin',
-            'GUICtrlListView_GetOriginX','GUICtrlListView_GetOriginY',
+            'GUICtrlListView_GetItemTextString', 'GUICtrlListView_GetNextItem',
+            'GUICtrlListView_GetNumberOfWorkAreas', 'GUICtrlListView_GetOrigin',
+            'GUICtrlListView_GetOriginX', 'GUICtrlListView_GetOriginY',
             'GUICtrlListView_GetOutlineColor',
             'GUICtrlListView_GetSelectedColumn',
             'GUICtrlListView_GetSelectedCount',
             'GUICtrlListView_GetSelectedIndices',
-            'GUICtrlListView_GetSelectionMark','GUICtrlListView_GetStringWidth',
-            'GUICtrlListView_GetSubItemRect','GUICtrlListView_GetTextBkColor',
-            'GUICtrlListView_GetTextColor','GUICtrlListView_GetToolTips',
-            'GUICtrlListView_GetTopIndex','GUICtrlListView_GetUnicodeFormat',
-            'GUICtrlListView_GetView','GUICtrlListView_GetViewDetails',
-            'GUICtrlListView_GetViewLarge','GUICtrlListView_GetViewList',
-            'GUICtrlListView_GetViewRect','GUICtrlListView_GetViewSmall',
-            'GUICtrlListView_GetViewTile','GUICtrlListView_HideColumn',
-            'GUICtrlListView_HitTest','GUICtrlListView_InsertColumn',
-            'GUICtrlListView_InsertGroup','GUICtrlListView_InsertItem',
-            'GUICtrlListView_JustifyColumn','GUICtrlListView_MapIDToIndex',
-            'GUICtrlListView_MapIndexToID','GUICtrlListView_RedrawItems',
+            'GUICtrlListView_GetSelectionMark', 'GUICtrlListView_GetStringWidth',
+            'GUICtrlListView_GetSubItemRect', 'GUICtrlListView_GetTextBkColor',
+            'GUICtrlListView_GetTextColor', 'GUICtrlListView_GetToolTips',
+            'GUICtrlListView_GetTopIndex', 'GUICtrlListView_GetUnicodeFormat',
+            'GUICtrlListView_GetView', 'GUICtrlListView_GetViewDetails',
+            'GUICtrlListView_GetViewLarge', 'GUICtrlListView_GetViewList',
+            'GUICtrlListView_GetViewRect', 'GUICtrlListView_GetViewSmall',
+            'GUICtrlListView_GetViewTile', 'GUICtrlListView_HideColumn',
+            'GUICtrlListView_HitTest', 'GUICtrlListView_InsertColumn',
+            'GUICtrlListView_InsertGroup', 'GUICtrlListView_InsertItem',
+            'GUICtrlListView_JustifyColumn', 'GUICtrlListView_MapIDToIndex',
+            'GUICtrlListView_MapIndexToID', 'GUICtrlListView_RedrawItems',
             'GUICtrlListView_RegisterSortCallBack',
-            'GUICtrlListView_RemoveAllGroups','GUICtrlListView_RemoveGroup',
-            'GUICtrlListView_Scroll','GUICtrlListView_SetBkColor',
-            'GUICtrlListView_SetBkImage','GUICtrlListView_SetCallBackMask',
-            'GUICtrlListView_SetColumn','GUICtrlListView_SetColumnOrder',
+            'GUICtrlListView_RemoveAllGroups', 'GUICtrlListView_RemoveGroup',
+            'GUICtrlListView_Scroll', 'GUICtrlListView_SetBkColor',
+            'GUICtrlListView_SetBkImage', 'GUICtrlListView_SetCallBackMask',
+            'GUICtrlListView_SetColumn', 'GUICtrlListView_SetColumnOrder',
             'GUICtrlListView_SetColumnOrderArray',
             'GUICtrlListView_SetColumnWidth',
             'GUICtrlListView_SetExtendedListViewStyle',
-            'GUICtrlListView_SetGroupInfo','GUICtrlListView_SetHotItem',
-            'GUICtrlListView_SetHoverTime','GUICtrlListView_SetIconSpacing',
-            'GUICtrlListView_SetImageList','GUICtrlListView_SetItem',
-            'GUICtrlListView_SetItemChecked','GUICtrlListView_SetItemCount',
-            'GUICtrlListView_SetItemCut','GUICtrlListView_SetItemDropHilited',
-            'GUICtrlListView_SetItemEx','GUICtrlListView_SetItemFocused',
-            'GUICtrlListView_SetItemGroupID','GUICtrlListView_SetItemImage',
-            'GUICtrlListView_SetItemIndent','GUICtrlListView_SetItemParam',
+            'GUICtrlListView_SetGroupInfo', 'GUICtrlListView_SetHotItem',
+            'GUICtrlListView_SetHoverTime', 'GUICtrlListView_SetIconSpacing',
+            'GUICtrlListView_SetImageList', 'GUICtrlListView_SetItem',
+            'GUICtrlListView_SetItemChecked', 'GUICtrlListView_SetItemCount',
+            'GUICtrlListView_SetItemCut', 'GUICtrlListView_SetItemDropHilited',
+            'GUICtrlListView_SetItemEx', 'GUICtrlListView_SetItemFocused',
+            'GUICtrlListView_SetItemGroupID', 'GUICtrlListView_SetItemImage',
+            'GUICtrlListView_SetItemIndent', 'GUICtrlListView_SetItemParam',
             'GUICtrlListView_SetItemPosition',
             'GUICtrlListView_SetItemPosition32',
-            'GUICtrlListView_SetItemSelected','GUICtrlListView_SetItemState',
-            'GUICtrlListView_SetItemStateImage','GUICtrlListView_SetItemText',
+            'GUICtrlListView_SetItemSelected', 'GUICtrlListView_SetItemState',
+            'GUICtrlListView_SetItemStateImage', 'GUICtrlListView_SetItemText',
             'GUICtrlListView_SetOutlineColor',
             'GUICtrlListView_SetSelectedColumn',
-            'GUICtrlListView_SetSelectionMark','GUICtrlListView_SetTextBkColor',
-            'GUICtrlListView_SetTextColor','GUICtrlListView_SetToolTips',
-            'GUICtrlListView_SetUnicodeFormat','GUICtrlListView_SetView',
-            'GUICtrlListView_SetWorkAreas','GUICtrlListView_SimpleSort',
-            'GUICtrlListView_SortItems','GUICtrlListView_SubItemHitTest',
-            'GUICtrlListView_UnRegisterSortCallBack',
-            'GUICtrlMenu_AddMenuItem','GUICtrlMenu_AppendMenu',
-            'GUICtrlMenu_CheckMenuItem','GUICtrlMenu_CheckRadioItem',
-            'GUICtrlMenu_CreateMenu','GUICtrlMenu_CreatePopup',
-            'GUICtrlMenu_DeleteMenu','GUICtrlMenu_DestroyMenu',
-            'GUICtrlMenu_DrawMenuBar','GUICtrlMenu_EnableMenuItem',
-            'GUICtrlMenu_FindItem','GUICtrlMenu_FindParent',
-            'GUICtrlMenu_GetItemBmp','GUICtrlMenu_GetItemBmpChecked',
-            'GUICtrlMenu_GetItemBmpUnchecked','GUICtrlMenu_GetItemChecked',
-            'GUICtrlMenu_GetItemCount','GUICtrlMenu_GetItemData',
-            'GUICtrlMenu_GetItemDefault','GUICtrlMenu_GetItemDisabled',
-            'GUICtrlMenu_GetItemEnabled','GUICtrlMenu_GetItemGrayed',
-            'GUICtrlMenu_GetItemHighlighted','GUICtrlMenu_GetItemID',
-            'GUICtrlMenu_GetItemInfo','GUICtrlMenu_GetItemRect',
-            'GUICtrlMenu_GetItemRectEx','GUICtrlMenu_GetItemState',
-            'GUICtrlMenu_GetItemStateEx','GUICtrlMenu_GetItemSubMenu',
-            'GUICtrlMenu_GetItemText','GUICtrlMenu_GetItemType',
-            'GUICtrlMenu_GetMenu','GUICtrlMenu_GetMenuBackground',
-            'GUICtrlMenu_GetMenuBarInfo','GUICtrlMenu_GetMenuContextHelpID',
-            'GUICtrlMenu_GetMenuData','GUICtrlMenu_GetMenuDefaultItem',
-            'GUICtrlMenu_GetMenuHeight','GUICtrlMenu_GetMenuInfo',
-            'GUICtrlMenu_GetMenuStyle','GUICtrlMenu_GetSystemMenu',
-            'GUICtrlMenu_InsertMenuItem','GUICtrlMenu_InsertMenuItemEx',
-            'GUICtrlMenu_IsMenu','GUICtrlMenu_LoadMenu',
-            'GUICtrlMenu_MapAccelerator','GUICtrlMenu_MenuItemFromPoint',
-            'GUICtrlMenu_RemoveMenu','GUICtrlMenu_SetItemBitmaps',
-            'GUICtrlMenu_SetItemBmp','GUICtrlMenu_SetItemBmpChecked',
-            'GUICtrlMenu_SetItemBmpUnchecked','GUICtrlMenu_SetItemChecked',
-            'GUICtrlMenu_SetItemData','GUICtrlMenu_SetItemDefault',
-            'GUICtrlMenu_SetItemDisabled','GUICtrlMenu_SetItemEnabled',
-            'GUICtrlMenu_SetItemGrayed','GUICtrlMenu_SetItemHighlighted',
-            'GUICtrlMenu_SetItemID','GUICtrlMenu_SetItemInfo',
-            'GUICtrlMenu_SetItemState','GUICtrlMenu_SetItemSubMenu',
-            'GUICtrlMenu_SetItemText','GUICtrlMenu_SetItemType',
-            'GUICtrlMenu_SetMenu','GUICtrlMenu_SetMenuBackground',
-            'GUICtrlMenu_SetMenuContextHelpID','GUICtrlMenu_SetMenuData',
-            'GUICtrlMenu_SetMenuDefaultItem','GUICtrlMenu_SetMenuHeight',
-            'GUICtrlMenu_SetMenuInfo','GUICtrlMenu_SetMenuStyle',
-            'GUICtrlMenu_TrackPopupMenu','GUICtrlMonthCal_Create',
-            'GUICtrlMonthCal_Destroy','GUICtrlMonthCal_GetColor',
-            'GUICtrlMonthCal_GetColorArray','GUICtrlMonthCal_GetCurSel',
-            'GUICtrlMonthCal_GetCurSelStr','GUICtrlMonthCal_GetFirstDOW',
-            'GUICtrlMonthCal_GetFirstDOWStr','GUICtrlMonthCal_GetMaxSelCount',
+            'GUICtrlListView_SetSelectionMark', 'GUICtrlListView_SetTextBkColor',
+            'GUICtrlListView_SetTextColor', 'GUICtrlListView_SetToolTips',
+            'GUICtrlListView_SetUnicodeFormat', 'GUICtrlListView_SetView',
+            'GUICtrlListView_SetWorkAreas', 'GUICtrlListView_SimpleSort',
+            'GUICtrlListView_SortItems', 'GUICtrlListView_SubItemHitTest',
+            'GUICtrlListView_UnRegisterSortCallBack', 'GUICtrlMenu_AddMenuItem',
+            'GUICtrlMenu_AppendMenu', 'GUICtrlMenu_CalculatePopupWindowPosition',
+            'GUICtrlMenu_CheckMenuItem', 'GUICtrlMenu_CheckRadioItem',
+            'GUICtrlMenu_CreateMenu', 'GUICtrlMenu_CreatePopup',
+            'GUICtrlMenu_DeleteMenu', 'GUICtrlMenu_DestroyMenu',
+            'GUICtrlMenu_DrawMenuBar', 'GUICtrlMenu_EnableMenuItem',
+            'GUICtrlMenu_FindItem', 'GUICtrlMenu_FindParent',
+            'GUICtrlMenu_GetItemBmp', 'GUICtrlMenu_GetItemBmpChecked',
+            'GUICtrlMenu_GetItemBmpUnchecked', 'GUICtrlMenu_GetItemChecked',
+            'GUICtrlMenu_GetItemCount', 'GUICtrlMenu_GetItemData',
+            'GUICtrlMenu_GetItemDefault', 'GUICtrlMenu_GetItemDisabled',
+            'GUICtrlMenu_GetItemEnabled', 'GUICtrlMenu_GetItemGrayed',
+            'GUICtrlMenu_GetItemHighlighted', 'GUICtrlMenu_GetItemID',
+            'GUICtrlMenu_GetItemInfo', 'GUICtrlMenu_GetItemRect',
+            'GUICtrlMenu_GetItemRectEx', 'GUICtrlMenu_GetItemState',
+            'GUICtrlMenu_GetItemStateEx', 'GUICtrlMenu_GetItemSubMenu',
+            'GUICtrlMenu_GetItemText', 'GUICtrlMenu_GetItemType',
+            'GUICtrlMenu_GetMenu', 'GUICtrlMenu_GetMenuBackground',
+            'GUICtrlMenu_GetMenuBarInfo', 'GUICtrlMenu_GetMenuContextHelpID',
+            'GUICtrlMenu_GetMenuData', 'GUICtrlMenu_GetMenuDefaultItem',
+            'GUICtrlMenu_GetMenuHeight', 'GUICtrlMenu_GetMenuInfo',
+            'GUICtrlMenu_GetMenuStyle', 'GUICtrlMenu_GetSystemMenu',
+            'GUICtrlMenu_InsertMenuItem', 'GUICtrlMenu_InsertMenuItemEx',
+            'GUICtrlMenu_IsMenu', 'GUICtrlMenu_LoadMenu',
+            'GUICtrlMenu_MapAccelerator', 'GUICtrlMenu_MenuItemFromPoint',
+            'GUICtrlMenu_RemoveMenu', 'GUICtrlMenu_SetItemBitmaps',
+            'GUICtrlMenu_SetItemBmp', 'GUICtrlMenu_SetItemBmpChecked',
+            'GUICtrlMenu_SetItemBmpUnchecked', 'GUICtrlMenu_SetItemChecked',
+            'GUICtrlMenu_SetItemData', 'GUICtrlMenu_SetItemDefault',
+            'GUICtrlMenu_SetItemDisabled', 'GUICtrlMenu_SetItemEnabled',
+            'GUICtrlMenu_SetItemGrayed', 'GUICtrlMenu_SetItemHighlighted',
+            'GUICtrlMenu_SetItemID', 'GUICtrlMenu_SetItemInfo',
+            'GUICtrlMenu_SetItemState', 'GUICtrlMenu_SetItemSubMenu',
+            'GUICtrlMenu_SetItemText', 'GUICtrlMenu_SetItemType',
+            'GUICtrlMenu_SetMenu', 'GUICtrlMenu_SetMenuBackground',
+            'GUICtrlMenu_SetMenuContextHelpID', 'GUICtrlMenu_SetMenuData',
+            'GUICtrlMenu_SetMenuDefaultItem', 'GUICtrlMenu_SetMenuHeight',
+            'GUICtrlMenu_SetMenuInfo', 'GUICtrlMenu_SetMenuStyle',
+            'GUICtrlMenu_TrackPopupMenu', 'GUICtrlMonthCal_Create',
+            'GUICtrlMonthCal_Destroy', 'GUICtrlMonthCal_GetCalendarBorder',
+            'GUICtrlMonthCal_GetCalendarCount', 'GUICtrlMonthCal_GetColor',
+            'GUICtrlMonthCal_GetColorArray', 'GUICtrlMonthCal_GetCurSel',
+            'GUICtrlMonthCal_GetCurSelStr', 'GUICtrlMonthCal_GetFirstDOW',
+            'GUICtrlMonthCal_GetFirstDOWStr', 'GUICtrlMonthCal_GetMaxSelCount',
             'GUICtrlMonthCal_GetMaxTodayWidth',
-            'GUICtrlMonthCal_GetMinReqHeight','GUICtrlMonthCal_GetMinReqRect',
+            'GUICtrlMonthCal_GetMinReqHeight', 'GUICtrlMonthCal_GetMinReqRect',
             'GUICtrlMonthCal_GetMinReqRectArray',
-            'GUICtrlMonthCal_GetMinReqWidth','GUICtrlMonthCal_GetMonthDelta',
-            'GUICtrlMonthCal_GetMonthRange','GUICtrlMonthCal_GetMonthRangeMax',
+            'GUICtrlMonthCal_GetMinReqWidth', 'GUICtrlMonthCal_GetMonthDelta',
+            'GUICtrlMonthCal_GetMonthRange', 'GUICtrlMonthCal_GetMonthRangeMax',
             'GUICtrlMonthCal_GetMonthRangeMaxStr',
             'GUICtrlMonthCal_GetMonthRangeMin',
             'GUICtrlMonthCal_GetMonthRangeMinStr',
-            'GUICtrlMonthCal_GetMonthRangeSpan','GUICtrlMonthCal_GetRange',
-            'GUICtrlMonthCal_GetRangeMax','GUICtrlMonthCal_GetRangeMaxStr',
-            'GUICtrlMonthCal_GetRangeMin','GUICtrlMonthCal_GetRangeMinStr',
-            'GUICtrlMonthCal_GetSelRange','GUICtrlMonthCal_GetSelRangeMax',
+            'GUICtrlMonthCal_GetMonthRangeSpan', 'GUICtrlMonthCal_GetRange',
+            'GUICtrlMonthCal_GetRangeMax', 'GUICtrlMonthCal_GetRangeMaxStr',
+            'GUICtrlMonthCal_GetRangeMin', 'GUICtrlMonthCal_GetRangeMinStr',
+            'GUICtrlMonthCal_GetSelRange', 'GUICtrlMonthCal_GetSelRangeMax',
             'GUICtrlMonthCal_GetSelRangeMaxStr',
             'GUICtrlMonthCal_GetSelRangeMin',
-            'GUICtrlMonthCal_GetSelRangeMinStr','GUICtrlMonthCal_GetToday',
-            'GUICtrlMonthCal_GetTodayStr','GUICtrlMonthCal_GetUnicodeFormat',
-            'GUICtrlMonthCal_HitTest','GUICtrlMonthCal_SetColor',
-            'GUICtrlMonthCal_SetCurSel','GUICtrlMonthCal_SetDayState',
-            'GUICtrlMonthCal_SetFirstDOW','GUICtrlMonthCal_SetMaxSelCount',
-            'GUICtrlMonthCal_SetMonthDelta','GUICtrlMonthCal_SetRange',
-            'GUICtrlMonthCal_SetSelRange','GUICtrlMonthCal_SetToday',
-            'GUICtrlMonthCal_SetUnicodeFormat','GUICtrlRebar_AddBand',
-            'GUICtrlRebar_AddToolBarBand','GUICtrlRebar_BeginDrag',
-            'GUICtrlRebar_Create','GUICtrlRebar_DeleteBand',
-            'GUICtrlRebar_Destroy','GUICtrlRebar_DragMove',
-            'GUICtrlRebar_EndDrag','GUICtrlRebar_GetBandBackColor',
-            'GUICtrlRebar_GetBandBorders','GUICtrlRebar_GetBandBordersEx',
-            'GUICtrlRebar_GetBandChildHandle','GUICtrlRebar_GetBandChildSize',
-            'GUICtrlRebar_GetBandCount','GUICtrlRebar_GetBandForeColor',
-            'GUICtrlRebar_GetBandHeaderSize','GUICtrlRebar_GetBandID',
-            'GUICtrlRebar_GetBandIdealSize','GUICtrlRebar_GetBandLength',
-            'GUICtrlRebar_GetBandLParam','GUICtrlRebar_GetBandMargins',
-            'GUICtrlRebar_GetBandMarginsEx','GUICtrlRebar_GetBandRect',
-            'GUICtrlRebar_GetBandRectEx','GUICtrlRebar_GetBandStyle',
-            'GUICtrlRebar_GetBandStyleBreak',
+            'GUICtrlMonthCal_GetSelRangeMinStr', 'GUICtrlMonthCal_GetToday',
+            'GUICtrlMonthCal_GetTodayStr', 'GUICtrlMonthCal_GetUnicodeFormat',
+            'GUICtrlMonthCal_HitTest', 'GUICtrlMonthCal_SetCalendarBorder',
+            'GUICtrlMonthCal_SetColor', 'GUICtrlMonthCal_SetCurSel',
+            'GUICtrlMonthCal_SetDayState', 'GUICtrlMonthCal_SetFirstDOW',
+            'GUICtrlMonthCal_SetMaxSelCount', 'GUICtrlMonthCal_SetMonthDelta',
+            'GUICtrlMonthCal_SetRange', 'GUICtrlMonthCal_SetSelRange',
+            'GUICtrlMonthCal_SetToday', 'GUICtrlMonthCal_SetUnicodeFormat',
+            'GUICtrlRebar_AddBand', 'GUICtrlRebar_AddToolBarBand',
+            'GUICtrlRebar_BeginDrag', 'GUICtrlRebar_Create',
+            'GUICtrlRebar_DeleteBand', 'GUICtrlRebar_Destroy',
+            'GUICtrlRebar_DragMove', 'GUICtrlRebar_EndDrag',
+            'GUICtrlRebar_GetBandBackColor', 'GUICtrlRebar_GetBandBorders',
+            'GUICtrlRebar_GetBandBordersEx', 'GUICtrlRebar_GetBandChildHandle',
+            'GUICtrlRebar_GetBandChildSize', 'GUICtrlRebar_GetBandCount',
+            'GUICtrlRebar_GetBandForeColor', 'GUICtrlRebar_GetBandHeaderSize',
+            'GUICtrlRebar_GetBandID', 'GUICtrlRebar_GetBandIdealSize',
+            'GUICtrlRebar_GetBandLength', 'GUICtrlRebar_GetBandLParam',
+            'GUICtrlRebar_GetBandMargins', 'GUICtrlRebar_GetBandMarginsEx',
+            'GUICtrlRebar_GetBandRect', 'GUICtrlRebar_GetBandRectEx',
+            'GUICtrlRebar_GetBandStyle', 'GUICtrlRebar_GetBandStyleBreak',
             'GUICtrlRebar_GetBandStyleChildEdge',
             'GUICtrlRebar_GetBandStyleFixedBMP',
             'GUICtrlRebar_GetBandStyleFixedSize',
@@ -640,18 +808,18 @@ $language_data = array (
             'GUICtrlRebar_GetBandStyleTopAlign',
             'GUICtrlRebar_GetBandStyleUseChevron',
             'GUICtrlRebar_GetBandStyleVariableHeight',
-            'GUICtrlRebar_GetBandText','GUICtrlRebar_GetBarHeight',
-            'GUICtrlRebar_GetBKColor','GUICtrlRebar_GetColorScheme',
-            'GUICtrlRebar_GetRowCount','GUICtrlRebar_GetRowHeight',
-            'GUICtrlRebar_GetTextColor','GUICtrlRebar_GetToolTips',
-            'GUICtrlRebar_GetUnicodeFormat','GUICtrlRebar_HitTest',
-            'GUICtrlRebar_IDToIndex','GUICtrlRebar_MaximizeBand',
-            'GUICtrlRebar_MinimizeBand','GUICtrlRebar_MoveBand',
-            'GUICtrlRebar_SetBandBackColor','GUICtrlRebar_SetBandForeColor',
-            'GUICtrlRebar_SetBandHeaderSize','GUICtrlRebar_SetBandID',
-            'GUICtrlRebar_SetBandIdealSize','GUICtrlRebar_SetBandLength',
-            'GUICtrlRebar_SetBandLParam','GUICtrlRebar_SetBandStyle',
-            'GUICtrlRebar_SetBandStyleBreak',
+            'GUICtrlRebar_GetBandText', 'GUICtrlRebar_GetBarHeight',
+            'GUICtrlRebar_GetBarInfo', 'GUICtrlRebar_GetBKColor',
+            'GUICtrlRebar_GetColorScheme', 'GUICtrlRebar_GetRowCount',
+            'GUICtrlRebar_GetRowHeight', 'GUICtrlRebar_GetTextColor',
+            'GUICtrlRebar_GetToolTips', 'GUICtrlRebar_GetUnicodeFormat',
+            'GUICtrlRebar_HitTest', 'GUICtrlRebar_IDToIndex',
+            'GUICtrlRebar_MaximizeBand', 'GUICtrlRebar_MinimizeBand',
+            'GUICtrlRebar_MoveBand', 'GUICtrlRebar_SetBandBackColor',
+            'GUICtrlRebar_SetBandForeColor', 'GUICtrlRebar_SetBandHeaderSize',
+            'GUICtrlRebar_SetBandID', 'GUICtrlRebar_SetBandIdealSize',
+            'GUICtrlRebar_SetBandLength', 'GUICtrlRebar_SetBandLParam',
+            'GUICtrlRebar_SetBandStyle', 'GUICtrlRebar_SetBandStyleBreak',
             'GUICtrlRebar_SetBandStyleChildEdge',
             'GUICtrlRebar_SetBandStyleFixedBMP',
             'GUICtrlRebar_SetBandStyleFixedSize',
@@ -662,429 +830,946 @@ $language_data = array (
             'GUICtrlRebar_SetBandStyleTopAlign',
             'GUICtrlRebar_SetBandStyleUseChevron',
             'GUICtrlRebar_SetBandStyleVariableHeight',
-            'GUICtrlRebar_SetBandText','GUICtrlRebar_SetBKColor',
-            'GUICtrlRebar_SetColorScheme','GUICtrlRebar_SetTextColor',
-            'GUICtrlRebar_SetToolTips','GUICtrlRebar_SetUnicodeFormat',
-            'GUICtrlRebar_ShowBand','GUICtrlSlider_ClearSel',
-            'GUICtrlSlider_ClearTics','GUICtrlSlider_Create',
-            'GUICtrlSlider_Destroy','GUICtrlSlider_GetBuddy',
-            'GUICtrlSlider_GetChannelRect','GUICtrlSlider_GetLineSize',
-            'GUICtrlSlider_GetNumTics','GUICtrlSlider_GetPageSize',
-            'GUICtrlSlider_GetPos','GUICtrlSlider_GetPTics',
-            'GUICtrlSlider_GetRange','GUICtrlSlider_GetRangeMax',
-            'GUICtrlSlider_GetRangeMin','GUICtrlSlider_GetSel',
-            'GUICtrlSlider_GetSelEnd','GUICtrlSlider_GetSelStart',
-            'GUICtrlSlider_GetThumbLength','GUICtrlSlider_GetThumbRect',
-            'GUICtrlSlider_GetThumbRectEx','GUICtrlSlider_GetTic',
-            'GUICtrlSlider_GetTicPos','GUICtrlSlider_GetToolTips',
-            'GUICtrlSlider_GetUnicodeFormat','GUICtrlSlider_SetBuddy',
-            'GUICtrlSlider_SetLineSize','GUICtrlSlider_SetPageSize',
-            'GUICtrlSlider_SetPos','GUICtrlSlider_SetRange',
-            'GUICtrlSlider_SetRangeMax','GUICtrlSlider_SetRangeMin',
-            'GUICtrlSlider_SetSel','GUICtrlSlider_SetSelEnd',
-            'GUICtrlSlider_SetSelStart','GUICtrlSlider_SetThumbLength',
-            'GUICtrlSlider_SetTic','GUICtrlSlider_SetTicFreq',
-            'GUICtrlSlider_SetTipSide','GUICtrlSlider_SetToolTips',
-            'GUICtrlSlider_SetUnicodeFormat','GUICtrlStatusBar_Create',
-            'GUICtrlStatusBar_Destroy','GUICtrlStatusBar_EmbedControl',
-            'GUICtrlStatusBar_GetBorders','GUICtrlStatusBar_GetBordersHorz',
-            'GUICtrlStatusBar_GetBordersRect','GUICtrlStatusBar_GetBordersVert',
-            'GUICtrlStatusBar_GetCount','GUICtrlStatusBar_GetHeight',
-            'GUICtrlStatusBar_GetIcon','GUICtrlStatusBar_GetParts',
-            'GUICtrlStatusBar_GetRect','GUICtrlStatusBar_GetRectEx',
-            'GUICtrlStatusBar_GetText','GUICtrlStatusBar_GetTextFlags',
-            'GUICtrlStatusBar_GetTextLength','GUICtrlStatusBar_GetTextLengthEx',
-            'GUICtrlStatusBar_GetTipText','GUICtrlStatusBar_GetUnicodeFormat',
-            'GUICtrlStatusBar_GetWidth','GUICtrlStatusBar_IsSimple',
-            'GUICtrlStatusBar_Resize','GUICtrlStatusBar_SetBkColor',
-            'GUICtrlStatusBar_SetIcon','GUICtrlStatusBar_SetMinHeight',
-            'GUICtrlStatusBar_SetParts','GUICtrlStatusBar_SetSimple',
-            'GUICtrlStatusBar_SetText','GUICtrlStatusBar_SetTipText',
-            'GUICtrlStatusBar_SetUnicodeFormat','GUICtrlStatusBar_ShowHide',
-            'GUICtrlTab_Create','GUICtrlTab_DeleteAllItems',
-            'GUICtrlTab_DeleteItem','GUICtrlTab_DeselectAll',
-            'GUICtrlTab_Destroy','GUICtrlTab_FindTab','GUICtrlTab_GetCurFocus',
-            'GUICtrlTab_GetCurSel','GUICtrlTab_GetDisplayRect',
-            'GUICtrlTab_GetDisplayRectEx','GUICtrlTab_GetExtendedStyle',
-            'GUICtrlTab_GetImageList','GUICtrlTab_GetItem',
-            'GUICtrlTab_GetItemCount','GUICtrlTab_GetItemImage',
-            'GUICtrlTab_GetItemParam','GUICtrlTab_GetItemRect',
-            'GUICtrlTab_GetItemRectEx','GUICtrlTab_GetItemState',
-            'GUICtrlTab_GetItemText','GUICtrlTab_GetRowCount',
-            'GUICtrlTab_GetToolTips','GUICtrlTab_GetUnicodeFormat',
-            'GUICtrlTab_HighlightItem','GUICtrlTab_HitTest',
-            'GUICtrlTab_InsertItem','GUICtrlTab_RemoveImage',
-            'GUICtrlTab_SetCurFocus','GUICtrlTab_SetCurSel',
-            'GUICtrlTab_SetExtendedStyle','GUICtrlTab_SetImageList',
-            'GUICtrlTab_SetItem','GUICtrlTab_SetItemImage',
-            'GUICtrlTab_SetItemParam','GUICtrlTab_SetItemSize',
-            'GUICtrlTab_SetItemState','GUICtrlTab_SetItemText',
-            'GUICtrlTab_SetMinTabWidth','GUICtrlTab_SetPadding',
-            'GUICtrlTab_SetToolTips','GUICtrlTab_SetUnicodeFormat',
-            'GUICtrlToolbar_AddBitmap','GUICtrlToolbar_AddButton',
-            'GUICtrlToolbar_AddButtonSep','GUICtrlToolbar_AddString',
-            'GUICtrlToolbar_ButtonCount','GUICtrlToolbar_CheckButton',
-            'GUICtrlToolbar_ClickAccel','GUICtrlToolbar_ClickButton',
-            'GUICtrlToolbar_ClickIndex','GUICtrlToolbar_CommandToIndex',
-            'GUICtrlToolbar_Create','GUICtrlToolbar_Customize',
-            'GUICtrlToolbar_DeleteButton','GUICtrlToolbar_Destroy',
-            'GUICtrlToolbar_EnableButton','GUICtrlToolbar_FindToolbar',
-            'GUICtrlToolbar_GetAnchorHighlight','GUICtrlToolbar_GetBitmapFlags',
-            'GUICtrlToolbar_GetButtonBitmap','GUICtrlToolbar_GetButtonInfo',
-            'GUICtrlToolbar_GetButtonInfoEx','GUICtrlToolbar_GetButtonParam',
-            'GUICtrlToolbar_GetButtonRect','GUICtrlToolbar_GetButtonRectEx',
-            'GUICtrlToolbar_GetButtonSize','GUICtrlToolbar_GetButtonState',
-            'GUICtrlToolbar_GetButtonStyle','GUICtrlToolbar_GetButtonText',
-            'GUICtrlToolbar_GetColorScheme',
+            'GUICtrlRebar_SetBandText', 'GUICtrlRebar_SetBarInfo',
+            'GUICtrlRebar_SetBKColor', 'GUICtrlRebar_SetColorScheme',
+            'GUICtrlRebar_SetTextColor', 'GUICtrlRebar_SetToolTips',
+            'GUICtrlRebar_SetUnicodeFormat', 'GUICtrlRebar_ShowBand',
+            'GUICtrlRichEdit_AppendText', 'GUICtrlRichEdit_AutoDetectURL',
+            'GUICtrlRichEdit_CanPaste', 'GUICtrlRichEdit_CanPasteSpecial',
+            'GUICtrlRichEdit_CanRedo', 'GUICtrlRichEdit_CanUndo',
+            'GUICtrlRichEdit_ChangeFontSize', 'GUICtrlRichEdit_Copy',
+            'GUICtrlRichEdit_Create', 'GUICtrlRichEdit_Cut',
+            'GUICtrlRichEdit_Deselect', 'GUICtrlRichEdit_Destroy',
+            'GUICtrlRichEdit_EmptyUndoBuffer', 'GUICtrlRichEdit_FindText',
+            'GUICtrlRichEdit_FindTextInRange', 'GUICtrlRichEdit_GetBkColor',
+            'GUICtrlRichEdit_GetCharAttributes',
+            'GUICtrlRichEdit_GetCharBkColor', 'GUICtrlRichEdit_GetCharColor',
+            'GUICtrlRichEdit_GetCharPosFromXY',
+            'GUICtrlRichEdit_GetCharPosOfNextWord',
+            'GUICtrlRichEdit_GetCharPosOfPreviousWord',
+            'GUICtrlRichEdit_GetCharWordBreakInfo',
+            'GUICtrlRichEdit_GetFirstCharPosOnLine', 'GUICtrlRichEdit_GetFont',
+            'GUICtrlRichEdit_GetLineCount', 'GUICtrlRichEdit_GetLineLength',
+            'GUICtrlRichEdit_GetLineNumberFromCharPos',
+            'GUICtrlRichEdit_GetNextRedo', 'GUICtrlRichEdit_GetNextUndo',
+            'GUICtrlRichEdit_GetNumberOfFirstVisibleLine',
+            'GUICtrlRichEdit_GetParaAlignment',
+            'GUICtrlRichEdit_GetParaAttributes', 'GUICtrlRichEdit_GetParaBorder',
+            'GUICtrlRichEdit_GetParaIndents', 'GUICtrlRichEdit_GetParaNumbering',
+            'GUICtrlRichEdit_GetParaShading', 'GUICtrlRichEdit_GetParaSpacing',
+            'GUICtrlRichEdit_GetParaTabStops', 'GUICtrlRichEdit_GetPasswordChar',
+            'GUICtrlRichEdit_GetRECT', 'GUICtrlRichEdit_GetScrollPos',
+            'GUICtrlRichEdit_GetSel', 'GUICtrlRichEdit_GetSelAA',
+            'GUICtrlRichEdit_GetSelText', 'GUICtrlRichEdit_GetSpaceUnit',
+            'GUICtrlRichEdit_GetText', 'GUICtrlRichEdit_GetTextInLine',
+            'GUICtrlRichEdit_GetTextInRange', 'GUICtrlRichEdit_GetTextLength',
+            'GUICtrlRichEdit_GetVersion', 'GUICtrlRichEdit_GetXYFromCharPos',
+            'GUICtrlRichEdit_GetZoom', 'GUICtrlRichEdit_GotoCharPos',
+            'GUICtrlRichEdit_HideSelection', 'GUICtrlRichEdit_InsertText',
+            'GUICtrlRichEdit_IsModified', 'GUICtrlRichEdit_IsTextSelected',
+            'GUICtrlRichEdit_Paste', 'GUICtrlRichEdit_PasteSpecial',
+            'GUICtrlRichEdit_PauseRedraw', 'GUICtrlRichEdit_Redo',
+            'GUICtrlRichEdit_ReplaceText', 'GUICtrlRichEdit_ResumeRedraw',
+            'GUICtrlRichEdit_ScrollLineOrPage', 'GUICtrlRichEdit_ScrollLines',
+            'GUICtrlRichEdit_ScrollToCaret', 'GUICtrlRichEdit_SetBkColor',
+            'GUICtrlRichEdit_SetCharAttributes',
+            'GUICtrlRichEdit_SetCharBkColor', 'GUICtrlRichEdit_SetCharColor',
+            'GUICtrlRichEdit_SetEventMask', 'GUICtrlRichEdit_SetFont',
+            'GUICtrlRichEdit_SetLimitOnText', 'GUICtrlRichEdit_SetModified',
+            'GUICtrlRichEdit_SetParaAlignment',
+            'GUICtrlRichEdit_SetParaAttributes', 'GUICtrlRichEdit_SetParaBorder',
+            'GUICtrlRichEdit_SetParaIndents', 'GUICtrlRichEdit_SetParaNumbering',
+            'GUICtrlRichEdit_SetParaShading', 'GUICtrlRichEdit_SetParaSpacing',
+            'GUICtrlRichEdit_SetParaTabStops', 'GUICtrlRichEdit_SetPasswordChar',
+            'GUICtrlRichEdit_SetReadOnly', 'GUICtrlRichEdit_SetRECT',
+            'GUICtrlRichEdit_SetScrollPos', 'GUICtrlRichEdit_SetSel',
+            'GUICtrlRichEdit_SetSpaceUnit', 'GUICtrlRichEdit_SetTabStops',
+            'GUICtrlRichEdit_SetText', 'GUICtrlRichEdit_SetUndoLimit',
+            'GUICtrlRichEdit_SetZoom', 'GUICtrlRichEdit_StreamFromFile',
+            'GUICtrlRichEdit_StreamFromVar', 'GUICtrlRichEdit_StreamToFile',
+            'GUICtrlRichEdit_StreamToVar', 'GUICtrlRichEdit_Undo',
+            'GUICtrlSlider_ClearSel', 'GUICtrlSlider_ClearTics',
+            'GUICtrlSlider_Create', 'GUICtrlSlider_Destroy',
+            'GUICtrlSlider_GetBuddy', 'GUICtrlSlider_GetChannelRect',
+            'GUICtrlSlider_GetChannelRectEx', 'GUICtrlSlider_GetLineSize',
+            'GUICtrlSlider_GetLogicalTics', 'GUICtrlSlider_GetNumTics',
+            'GUICtrlSlider_GetPageSize', 'GUICtrlSlider_GetPos',
+            'GUICtrlSlider_GetRange', 'GUICtrlSlider_GetRangeMax',
+            'GUICtrlSlider_GetRangeMin', 'GUICtrlSlider_GetSel',
+            'GUICtrlSlider_GetSelEnd', 'GUICtrlSlider_GetSelStart',
+            'GUICtrlSlider_GetThumbLength', 'GUICtrlSlider_GetThumbRect',
+            'GUICtrlSlider_GetThumbRectEx', 'GUICtrlSlider_GetTic',
+            'GUICtrlSlider_GetTicPos', 'GUICtrlSlider_GetToolTips',
+            'GUICtrlSlider_GetUnicodeFormat', 'GUICtrlSlider_SetBuddy',
+            'GUICtrlSlider_SetLineSize', 'GUICtrlSlider_SetPageSize',
+            'GUICtrlSlider_SetPos', 'GUICtrlSlider_SetRange',
+            'GUICtrlSlider_SetRangeMax', 'GUICtrlSlider_SetRangeMin',
+            'GUICtrlSlider_SetSel', 'GUICtrlSlider_SetSelEnd',
+            'GUICtrlSlider_SetSelStart', 'GUICtrlSlider_SetThumbLength',
+            'GUICtrlSlider_SetTic', 'GUICtrlSlider_SetTicFreq',
+            'GUICtrlSlider_SetTipSide', 'GUICtrlSlider_SetToolTips',
+            'GUICtrlSlider_SetUnicodeFormat', 'GUICtrlStatusBar_Create',
+            'GUICtrlStatusBar_Destroy', 'GUICtrlStatusBar_EmbedControl',
+            'GUICtrlStatusBar_GetBorders', 'GUICtrlStatusBar_GetBordersHorz',
+            'GUICtrlStatusBar_GetBordersRect', 'GUICtrlStatusBar_GetBordersVert',
+            'GUICtrlStatusBar_GetCount', 'GUICtrlStatusBar_GetHeight',
+            'GUICtrlStatusBar_GetIcon', 'GUICtrlStatusBar_GetParts',
+            'GUICtrlStatusBar_GetRect', 'GUICtrlStatusBar_GetRectEx',
+            'GUICtrlStatusBar_GetText', 'GUICtrlStatusBar_GetTextFlags',
+            'GUICtrlStatusBar_GetTextLength', 'GUICtrlStatusBar_GetTextLengthEx',
+            'GUICtrlStatusBar_GetTipText', 'GUICtrlStatusBar_GetUnicodeFormat',
+            'GUICtrlStatusBar_GetWidth', 'GUICtrlStatusBar_IsSimple',
+            'GUICtrlStatusBar_Resize', 'GUICtrlStatusBar_SetBkColor',
+            'GUICtrlStatusBar_SetIcon', 'GUICtrlStatusBar_SetMinHeight',
+            'GUICtrlStatusBar_SetParts', 'GUICtrlStatusBar_SetSimple',
+            'GUICtrlStatusBar_SetText', 'GUICtrlStatusBar_SetTipText',
+            'GUICtrlStatusBar_SetUnicodeFormat', 'GUICtrlStatusBar_ShowHide',
+            'GUICtrlTab_ActivateTab', 'GUICtrlTab_ClickTab', 'GUICtrlTab_Create',
+            'GUICtrlTab_DeleteAllItems', 'GUICtrlTab_DeleteItem',
+            'GUICtrlTab_DeselectAll', 'GUICtrlTab_Destroy', 'GUICtrlTab_FindTab',
+            'GUICtrlTab_GetCurFocus', 'GUICtrlTab_GetCurSel',
+            'GUICtrlTab_GetDisplayRect', 'GUICtrlTab_GetDisplayRectEx',
+            'GUICtrlTab_GetExtendedStyle', 'GUICtrlTab_GetImageList',
+            'GUICtrlTab_GetItem', 'GUICtrlTab_GetItemCount',
+            'GUICtrlTab_GetItemImage', 'GUICtrlTab_GetItemParam',
+            'GUICtrlTab_GetItemRect', 'GUICtrlTab_GetItemRectEx',
+            'GUICtrlTab_GetItemState', 'GUICtrlTab_GetItemText',
+            'GUICtrlTab_GetRowCount', 'GUICtrlTab_GetToolTips',
+            'GUICtrlTab_GetUnicodeFormat', 'GUICtrlTab_HighlightItem',
+            'GUICtrlTab_HitTest', 'GUICtrlTab_InsertItem',
+            'GUICtrlTab_RemoveImage', 'GUICtrlTab_SetCurFocus',
+            'GUICtrlTab_SetCurSel', 'GUICtrlTab_SetExtendedStyle',
+            'GUICtrlTab_SetImageList', 'GUICtrlTab_SetItem',
+            'GUICtrlTab_SetItemImage', 'GUICtrlTab_SetItemParam',
+            'GUICtrlTab_SetItemSize', 'GUICtrlTab_SetItemState',
+            'GUICtrlTab_SetItemText', 'GUICtrlTab_SetMinTabWidth',
+            'GUICtrlTab_SetPadding', 'GUICtrlTab_SetToolTips',
+            'GUICtrlTab_SetUnicodeFormat', 'GUICtrlToolbar_AddBitmap',
+            'GUICtrlToolbar_AddButton', 'GUICtrlToolbar_AddButtonSep',
+            'GUICtrlToolbar_AddString', 'GUICtrlToolbar_ButtonCount',
+            'GUICtrlToolbar_CheckButton', 'GUICtrlToolbar_ClickAccel',
+            'GUICtrlToolbar_ClickButton', 'GUICtrlToolbar_ClickIndex',
+            'GUICtrlToolbar_CommandToIndex', 'GUICtrlToolbar_Create',
+            'GUICtrlToolbar_Customize', 'GUICtrlToolbar_DeleteButton',
+            'GUICtrlToolbar_Destroy', 'GUICtrlToolbar_EnableButton',
+            'GUICtrlToolbar_FindToolbar', 'GUICtrlToolbar_GetAnchorHighlight',
+            'GUICtrlToolbar_GetBitmapFlags', 'GUICtrlToolbar_GetButtonBitmap',
+            'GUICtrlToolbar_GetButtonInfo', 'GUICtrlToolbar_GetButtonInfoEx',
+            'GUICtrlToolbar_GetButtonParam', 'GUICtrlToolbar_GetButtonRect',
+            'GUICtrlToolbar_GetButtonRectEx', 'GUICtrlToolbar_GetButtonSize',
+            'GUICtrlToolbar_GetButtonState', 'GUICtrlToolbar_GetButtonStyle',
+            'GUICtrlToolbar_GetButtonText', 'GUICtrlToolbar_GetColorScheme',
             'GUICtrlToolbar_GetDisabledImageList',
-            'GUICtrlToolbar_GetExtendedStyle','GUICtrlToolbar_GetHotImageList',
-            'GUICtrlToolbar_GetHotItem','GUICtrlToolbar_GetImageList',
-            'GUICtrlToolbar_GetInsertMark','GUICtrlToolbar_GetInsertMarkColor',
-            'GUICtrlToolbar_GetMaxSize','GUICtrlToolbar_GetMetrics',
-            'GUICtrlToolbar_GetPadding','GUICtrlToolbar_GetRows',
-            'GUICtrlToolbar_GetString','GUICtrlToolbar_GetStyle',
+            'GUICtrlToolbar_GetExtendedStyle', 'GUICtrlToolbar_GetHotImageList',
+            'GUICtrlToolbar_GetHotItem', 'GUICtrlToolbar_GetImageList',
+            'GUICtrlToolbar_GetInsertMark', 'GUICtrlToolbar_GetInsertMarkColor',
+            'GUICtrlToolbar_GetMaxSize', 'GUICtrlToolbar_GetMetrics',
+            'GUICtrlToolbar_GetPadding', 'GUICtrlToolbar_GetRows',
+            'GUICtrlToolbar_GetString', 'GUICtrlToolbar_GetStyle',
             'GUICtrlToolbar_GetStyleAltDrag',
-            'GUICtrlToolbar_GetStyleCustomErase','GUICtrlToolbar_GetStyleFlat',
-            'GUICtrlToolbar_GetStyleList','GUICtrlToolbar_GetStyleRegisterDrop',
+            'GUICtrlToolbar_GetStyleCustomErase', 'GUICtrlToolbar_GetStyleFlat',
+            'GUICtrlToolbar_GetStyleList', 'GUICtrlToolbar_GetStyleRegisterDrop',
             'GUICtrlToolbar_GetStyleToolTips',
             'GUICtrlToolbar_GetStyleTransparent',
-            'GUICtrlToolbar_GetStyleWrapable','GUICtrlToolbar_GetTextRows',
-            'GUICtrlToolbar_GetToolTips','GUICtrlToolbar_GetUnicodeFormat',
-            'GUICtrlToolbar_HideButton','GUICtrlToolbar_HighlightButton',
-            'GUICtrlToolbar_HitTest','GUICtrlToolbar_IndexToCommand',
-            'GUICtrlToolbar_InsertButton','GUICtrlToolbar_InsertMarkHitTest',
-            'GUICtrlToolbar_IsButtonChecked','GUICtrlToolbar_IsButtonEnabled',
+            'GUICtrlToolbar_GetStyleWrapable', 'GUICtrlToolbar_GetTextRows',
+            'GUICtrlToolbar_GetToolTips', 'GUICtrlToolbar_GetUnicodeFormat',
+            'GUICtrlToolbar_HideButton', 'GUICtrlToolbar_HighlightButton',
+            'GUICtrlToolbar_HitTest', 'GUICtrlToolbar_IndexToCommand',
+            'GUICtrlToolbar_InsertButton', 'GUICtrlToolbar_InsertMarkHitTest',
+            'GUICtrlToolbar_IsButtonChecked', 'GUICtrlToolbar_IsButtonEnabled',
             'GUICtrlToolbar_IsButtonHidden',
             'GUICtrlToolbar_IsButtonHighlighted',
             'GUICtrlToolbar_IsButtonIndeterminate',
-            'GUICtrlToolbar_IsButtonPressed','GUICtrlToolbar_LoadBitmap',
-            'GUICtrlToolbar_LoadImages','GUICtrlToolbar_MapAccelerator',
-            'GUICtrlToolbar_MoveButton','GUICtrlToolbar_PressButton',
-            'GUICtrlToolbar_SetAnchorHighlight','GUICtrlToolbar_SetBitmapSize',
-            'GUICtrlToolbar_SetButtonBitMap','GUICtrlToolbar_SetButtonInfo',
-            'GUICtrlToolbar_SetButtonInfoEx','GUICtrlToolbar_SetButtonParam',
-            'GUICtrlToolbar_SetButtonSize','GUICtrlToolbar_SetButtonState',
-            'GUICtrlToolbar_SetButtonStyle','GUICtrlToolbar_SetButtonText',
-            'GUICtrlToolbar_SetButtonWidth','GUICtrlToolbar_SetCmdID',
+            'GUICtrlToolbar_IsButtonPressed', 'GUICtrlToolbar_LoadBitmap',
+            'GUICtrlToolbar_LoadImages', 'GUICtrlToolbar_MapAccelerator',
+            'GUICtrlToolbar_MoveButton', 'GUICtrlToolbar_PressButton',
+            'GUICtrlToolbar_SetAnchorHighlight', 'GUICtrlToolbar_SetBitmapSize',
+            'GUICtrlToolbar_SetButtonBitMap', 'GUICtrlToolbar_SetButtonInfo',
+            'GUICtrlToolbar_SetButtonInfoEx', 'GUICtrlToolbar_SetButtonParam',
+            'GUICtrlToolbar_SetButtonSize', 'GUICtrlToolbar_SetButtonState',
+            'GUICtrlToolbar_SetButtonStyle', 'GUICtrlToolbar_SetButtonText',
+            'GUICtrlToolbar_SetButtonWidth', 'GUICtrlToolbar_SetCmdID',
             'GUICtrlToolbar_SetColorScheme',
             'GUICtrlToolbar_SetDisabledImageList',
-            'GUICtrlToolbar_SetDrawTextFlags','GUICtrlToolbar_SetExtendedStyle',
-            'GUICtrlToolbar_SetHotImageList','GUICtrlToolbar_SetHotItem',
-            'GUICtrlToolbar_SetImageList','GUICtrlToolbar_SetIndent',
-            'GUICtrlToolbar_SetIndeterminate','GUICtrlToolbar_SetInsertMark',
-            'GUICtrlToolbar_SetInsertMarkColor','GUICtrlToolbar_SetMaxTextRows',
-            'GUICtrlToolbar_SetMetrics','GUICtrlToolbar_SetPadding',
-            'GUICtrlToolbar_SetParent','GUICtrlToolbar_SetRows',
-            'GUICtrlToolbar_SetStyle','GUICtrlToolbar_SetStyleAltDrag',
-            'GUICtrlToolbar_SetStyleCustomErase','GUICtrlToolbar_SetStyleFlat',
-            'GUICtrlToolbar_SetStyleList','GUICtrlToolbar_SetStyleRegisterDrop',
+            'GUICtrlToolbar_SetDrawTextFlags', 'GUICtrlToolbar_SetExtendedStyle',
+            'GUICtrlToolbar_SetHotImageList', 'GUICtrlToolbar_SetHotItem',
+            'GUICtrlToolbar_SetImageList', 'GUICtrlToolbar_SetIndent',
+            'GUICtrlToolbar_SetIndeterminate', 'GUICtrlToolbar_SetInsertMark',
+            'GUICtrlToolbar_SetInsertMarkColor', 'GUICtrlToolbar_SetMaxTextRows',
+            'GUICtrlToolbar_SetMetrics', 'GUICtrlToolbar_SetPadding',
+            'GUICtrlToolbar_SetParent', 'GUICtrlToolbar_SetRows',
+            'GUICtrlToolbar_SetStyle', 'GUICtrlToolbar_SetStyleAltDrag',
+            'GUICtrlToolbar_SetStyleCustomErase', 'GUICtrlToolbar_SetStyleFlat',
+            'GUICtrlToolbar_SetStyleList', 'GUICtrlToolbar_SetStyleRegisterDrop',
             'GUICtrlToolbar_SetStyleToolTips',
             'GUICtrlToolbar_SetStyleTransparent',
-            'GUICtrlToolbar_SetStyleWrapable','GUICtrlToolbar_SetToolTips',
-            'GUICtrlToolbar_SetUnicodeFormat','GUICtrlToolbar_SetWindowTheme',
-            'GUICtrlTreeView_Add','GUICtrlTreeView_AddChild',
-            'GUICtrlTreeView_AddChildFirst','GUICtrlTreeView_AddFirst',
-            'GUICtrlTreeView_BeginUpdate','GUICtrlTreeView_ClickItem',
-            'GUICtrlTreeView_Create','GUICtrlTreeView_CreateDragImage',
-            'GUICtrlTreeView_CreateSolidBitMap','GUICtrlTreeView_Delete',
-            'GUICtrlTreeView_DeleteAll','GUICtrlTreeView_DeleteChildren',
-            'GUICtrlTreeView_Destroy','GUICtrlTreeView_DisplayRect',
-            'GUICtrlTreeView_DisplayRectEx','GUICtrlTreeView_EditText',
-            'GUICtrlTreeView_EndEdit','GUICtrlTreeView_EndUpdate',
-            'GUICtrlTreeView_EnsureVisible','GUICtrlTreeView_Expand',
-            'GUICtrlTreeView_ExpandedOnce','GUICtrlTreeView_FindItem',
-            'GUICtrlTreeView_FindItemEx','GUICtrlTreeView_GetBkColor',
-            'GUICtrlTreeView_GetBold','GUICtrlTreeView_GetChecked',
-            'GUICtrlTreeView_GetChildCount','GUICtrlTreeView_GetChildren',
-            'GUICtrlTreeView_GetCount','GUICtrlTreeView_GetCut',
-            'GUICtrlTreeView_GetDropTarget','GUICtrlTreeView_GetEditControl',
-            'GUICtrlTreeView_GetExpanded','GUICtrlTreeView_GetFirstChild',
-            'GUICtrlTreeView_GetFirstItem','GUICtrlTreeView_GetFirstVisible',
-            'GUICtrlTreeView_GetFocused','GUICtrlTreeView_GetHeight',
+            'GUICtrlToolbar_SetStyleWrapable', 'GUICtrlToolbar_SetToolTips',
+            'GUICtrlToolbar_SetUnicodeFormat', 'GUICtrlToolbar_SetWindowTheme',
+            'GUICtrlTreeView_Add', 'GUICtrlTreeView_AddChild',
+            'GUICtrlTreeView_AddChildFirst', 'GUICtrlTreeView_AddFirst',
+            'GUICtrlTreeView_BeginUpdate', 'GUICtrlTreeView_ClickItem',
+            'GUICtrlTreeView_Create', 'GUICtrlTreeView_CreateDragImage',
+            'GUICtrlTreeView_CreateSolidBitMap', 'GUICtrlTreeView_Delete',
+            'GUICtrlTreeView_DeleteAll', 'GUICtrlTreeView_DeleteChildren',
+            'GUICtrlTreeView_Destroy', 'GUICtrlTreeView_DisplayRect',
+            'GUICtrlTreeView_DisplayRectEx', 'GUICtrlTreeView_EditText',
+            'GUICtrlTreeView_EndEdit', 'GUICtrlTreeView_EndUpdate',
+            'GUICtrlTreeView_EnsureVisible', 'GUICtrlTreeView_Expand',
+            'GUICtrlTreeView_ExpandedOnce', 'GUICtrlTreeView_FindItem',
+            'GUICtrlTreeView_FindItemEx', 'GUICtrlTreeView_GetBkColor',
+            'GUICtrlTreeView_GetBold', 'GUICtrlTreeView_GetChecked',
+            'GUICtrlTreeView_GetChildCount', 'GUICtrlTreeView_GetChildren',
+            'GUICtrlTreeView_GetCount', 'GUICtrlTreeView_GetCut',
+            'GUICtrlTreeView_GetDropTarget', 'GUICtrlTreeView_GetEditControl',
+            'GUICtrlTreeView_GetExpanded', 'GUICtrlTreeView_GetFirstChild',
+            'GUICtrlTreeView_GetFirstItem', 'GUICtrlTreeView_GetFirstVisible',
+            'GUICtrlTreeView_GetFocused', 'GUICtrlTreeView_GetHeight',
             'GUICtrlTreeView_GetImageIndex',
             'GUICtrlTreeView_GetImageListIconHandle',
-            'GUICtrlTreeView_GetIndent','GUICtrlTreeView_GetInsertMarkColor',
-            'GUICtrlTreeView_GetISearchString','GUICtrlTreeView_GetItemByIndex',
-            'GUICtrlTreeView_GetItemHandle','GUICtrlTreeView_GetItemParam',
-            'GUICtrlTreeView_GetLastChild','GUICtrlTreeView_GetLineColor',
-            'GUICtrlTreeView_GetNext','GUICtrlTreeView_GetNextChild',
-            'GUICtrlTreeView_GetNextSibling','GUICtrlTreeView_GetNextVisible',
+            'GUICtrlTreeView_GetIndent', 'GUICtrlTreeView_GetInsertMarkColor',
+            'GUICtrlTreeView_GetISearchString', 'GUICtrlTreeView_GetItemByIndex',
+            'GUICtrlTreeView_GetItemHandle', 'GUICtrlTreeView_GetItemParam',
+            'GUICtrlTreeView_GetLastChild', 'GUICtrlTreeView_GetLineColor',
+            'GUICtrlTreeView_GetNext', 'GUICtrlTreeView_GetNextChild',
+            'GUICtrlTreeView_GetNextSibling', 'GUICtrlTreeView_GetNextVisible',
             'GUICtrlTreeView_GetNormalImageList',
-            'GUICtrlTreeView_GetParentHandle','GUICtrlTreeView_GetParentParam',
-            'GUICtrlTreeView_GetPrev','GUICtrlTreeView_GetPrevChild',
-            'GUICtrlTreeView_GetPrevSibling','GUICtrlTreeView_GetPrevVisible',
-            'GUICtrlTreeView_GetScrollTime','GUICtrlTreeView_GetSelected',
+            'GUICtrlTreeView_GetParentHandle', 'GUICtrlTreeView_GetParentParam',
+            'GUICtrlTreeView_GetPrev', 'GUICtrlTreeView_GetPrevChild',
+            'GUICtrlTreeView_GetPrevSibling', 'GUICtrlTreeView_GetPrevVisible',
+            'GUICtrlTreeView_GetScrollTime', 'GUICtrlTreeView_GetSelected',
             'GUICtrlTreeView_GetSelectedImageIndex',
-            'GUICtrlTreeView_GetSelection','GUICtrlTreeView_GetSiblingCount',
-            'GUICtrlTreeView_GetState','GUICtrlTreeView_GetStateImageIndex',
-            'GUICtrlTreeView_GetStateImageList','GUICtrlTreeView_GetText',
-            'GUICtrlTreeView_GetTextColor','GUICtrlTreeView_GetToolTips',
-            'GUICtrlTreeView_GetTree','GUICtrlTreeView_GetUnicodeFormat',
-            'GUICtrlTreeView_GetVisible','GUICtrlTreeView_GetVisibleCount',
-            'GUICtrlTreeView_HitTest','GUICtrlTreeView_HitTestEx',
-            'GUICtrlTreeView_HitTestItem','GUICtrlTreeView_Index',
-            'GUICtrlTreeView_InsertItem','GUICtrlTreeView_IsFirstItem',
-            'GUICtrlTreeView_IsParent','GUICtrlTreeView_Level',
-            'GUICtrlTreeView_SelectItem','GUICtrlTreeView_SelectItemByIndex',
-            'GUICtrlTreeView_SetBkColor','GUICtrlTreeView_SetBold',
-            'GUICtrlTreeView_SetChecked','GUICtrlTreeView_SetCheckedByIndex',
-            'GUICtrlTreeView_SetChildren','GUICtrlTreeView_SetCut',
-            'GUICtrlTreeView_SetDropTarget','GUICtrlTreeView_SetFocused',
-            'GUICtrlTreeView_SetHeight','GUICtrlTreeView_SetIcon',
-            'GUICtrlTreeView_SetImageIndex','GUICtrlTreeView_SetIndent',
+            'GUICtrlTreeView_GetSelection', 'GUICtrlTreeView_GetSiblingCount',
+            'GUICtrlTreeView_GetState', 'GUICtrlTreeView_GetStateImageIndex',
+            'GUICtrlTreeView_GetStateImageList', 'GUICtrlTreeView_GetText',
+            'GUICtrlTreeView_GetTextColor', 'GUICtrlTreeView_GetToolTips',
+            'GUICtrlTreeView_GetTree', 'GUICtrlTreeView_GetUnicodeFormat',
+            'GUICtrlTreeView_GetVisible', 'GUICtrlTreeView_GetVisibleCount',
+            'GUICtrlTreeView_HitTest', 'GUICtrlTreeView_HitTestEx',
+            'GUICtrlTreeView_HitTestItem', 'GUICtrlTreeView_Index',
+            'GUICtrlTreeView_InsertItem', 'GUICtrlTreeView_IsFirstItem',
+            'GUICtrlTreeView_IsParent', 'GUICtrlTreeView_Level',
+            'GUICtrlTreeView_SelectItem', 'GUICtrlTreeView_SelectItemByIndex',
+            'GUICtrlTreeView_SetBkColor', 'GUICtrlTreeView_SetBold',
+            'GUICtrlTreeView_SetChecked', 'GUICtrlTreeView_SetCheckedByIndex',
+            'GUICtrlTreeView_SetChildren', 'GUICtrlTreeView_SetCut',
+            'GUICtrlTreeView_SetDropTarget', 'GUICtrlTreeView_SetFocused',
+            'GUICtrlTreeView_SetHeight', 'GUICtrlTreeView_SetIcon',
+            'GUICtrlTreeView_SetImageIndex', 'GUICtrlTreeView_SetIndent',
             'GUICtrlTreeView_SetInsertMark',
             'GUICtrlTreeView_SetInsertMarkColor',
-            'GUICtrlTreeView_SetItemHeight','GUICtrlTreeView_SetItemParam',
-            'GUICtrlTreeView_SetLineColor','GUICtrlTreeView_SetNormalImageList',
-            'GUICtrlTreeView_SetScrollTime','GUICtrlTreeView_SetSelected',
-            'GUICtrlTreeView_SetSelectedImageIndex','GUICtrlTreeView_SetState',
+            'GUICtrlTreeView_SetItemHeight', 'GUICtrlTreeView_SetItemParam',
+            'GUICtrlTreeView_SetLineColor', 'GUICtrlTreeView_SetNormalImageList',
+            'GUICtrlTreeView_SetScrollTime', 'GUICtrlTreeView_SetSelected',
+            'GUICtrlTreeView_SetSelectedImageIndex', 'GUICtrlTreeView_SetState',
             'GUICtrlTreeView_SetStateImageIndex',
-            'GUICtrlTreeView_SetStateImageList','GUICtrlTreeView_SetText',
-            'GUICtrlTreeView_SetTextColor','GUICtrlTreeView_SetToolTips',
-            'GUICtrlTreeView_SetUnicodeFormat','GUICtrlTreeView_Sort',
-            'GUIImageList_Add','GUIImageList_AddBitmap','GUIImageList_AddIcon',
-            'GUIImageList_AddMasked','GUIImageList_BeginDrag',
-            'GUIImageList_Copy','GUIImageList_Create','GUIImageList_Destroy',
-            'GUIImageList_DestroyIcon','GUIImageList_DragEnter',
-            'GUIImageList_DragLeave','GUIImageList_DragMove',
-            'GUIImageList_Draw','GUIImageList_DrawEx','GUIImageList_Duplicate',
-            'GUIImageList_EndDrag','GUIImageList_GetBkColor',
-            'GUIImageList_GetIcon','GUIImageList_GetIconHeight',
-            'GUIImageList_GetIconSize','GUIImageList_GetIconSizeEx',
-            'GUIImageList_GetIconWidth','GUIImageList_GetImageCount',
-            'GUIImageList_GetImageInfoEx','GUIImageList_Remove',
-            'GUIImageList_ReplaceIcon','GUIImageList_SetBkColor',
-            'GUIImageList_SetIconSize','GUIImageList_SetImageCount',
-            'GUIImageList_Swap','GUIScrollBars_EnableScrollBar',
-            'GUIScrollBars_GetScrollBarInfoEx','GUIScrollBars_GetScrollBarRect',
+            'GUICtrlTreeView_SetStateImageList', 'GUICtrlTreeView_SetText',
+            'GUICtrlTreeView_SetTextColor', 'GUICtrlTreeView_SetToolTips',
+            'GUICtrlTreeView_SetUnicodeFormat', 'GUICtrlTreeView_Sort',
+            'GUIImageList_Add', 'GUIImageList_AddBitmap', 'GUIImageList_AddIcon',
+            'GUIImageList_AddMasked', 'GUIImageList_BeginDrag',
+            'GUIImageList_Copy', 'GUIImageList_Create', 'GUIImageList_Destroy',
+            'GUIImageList_DestroyIcon', 'GUIImageList_DragEnter',
+            'GUIImageList_DragLeave', 'GUIImageList_DragMove',
+            'GUIImageList_Draw', 'GUIImageList_DrawEx', 'GUIImageList_Duplicate',
+            'GUIImageList_EndDrag', 'GUIImageList_GetBkColor',
+            'GUIImageList_GetIcon', 'GUIImageList_GetIconHeight',
+            'GUIImageList_GetIconSize', 'GUIImageList_GetIconSizeEx',
+            'GUIImageList_GetIconWidth', 'GUIImageList_GetImageCount',
+            'GUIImageList_GetImageInfoEx', 'GUIImageList_Remove',
+            'GUIImageList_ReplaceIcon', 'GUIImageList_SetBkColor',
+            'GUIImageList_SetIconSize', 'GUIImageList_SetImageCount',
+            'GUIImageList_Swap', 'GUIScrollBars_EnableScrollBar',
+            'GUIScrollBars_GetScrollBarInfoEx', 'GUIScrollBars_GetScrollBarRect',
             'GUIScrollBars_GetScrollBarRGState',
             'GUIScrollBars_GetScrollBarXYLineButton',
             'GUIScrollBars_GetScrollBarXYThumbBottom',
             'GUIScrollBars_GetScrollBarXYThumbTop',
-            'GUIScrollBars_GetScrollInfo','GUIScrollBars_GetScrollInfoEx',
-            'GUIScrollBars_GetScrollInfoMax','GUIScrollBars_GetScrollInfoMin',
-            'GUIScrollBars_GetScrollInfoPage','GUIScrollBars_GetScrollInfoPos',
-            'GUIScrollBars_GetScrollInfoTrackPos','GUIScrollBars_GetScrollPos',
-            'GUIScrollBars_GetScrollRange','GUIScrollBars_Init',
-            'GUIScrollBars_ScrollWindow','GUIScrollBars_SetScrollInfo',
-            'GUIScrollBars_SetScrollInfoMax','GUIScrollBars_SetScrollInfoMin',
-            'GUIScrollBars_SetScrollInfoPage','GUIScrollBars_SetScrollInfoPos',
-            'GUIScrollBars_SetScrollRange','GUIScrollBars_ShowScrollBar',
-            'GUIToolTip_Activate','GUIToolTip_AddTool','GUIToolTip_AdjustRect',
-            'GUIToolTip_BitsToTTF','GUIToolTip_Create','GUIToolTip_DelTool',
-            'GUIToolTip_Destroy','GUIToolTip_EnumTools',
-            'GUIToolTip_GetBubbleHeight','GUIToolTip_GetBubbleSize',
-            'GUIToolTip_GetBubbleWidth','GUIToolTip_GetCurrentTool',
-            'GUIToolTip_GetDelayTime','GUIToolTip_GetMargin',
-            'GUIToolTip_GetMarginEx','GUIToolTip_GetMaxTipWidth',
-            'GUIToolTip_GetText','GUIToolTip_GetTipBkColor',
-            'GUIToolTip_GetTipTextColor','GUIToolTip_GetTitleBitMap',
-            'GUIToolTip_GetTitleText','GUIToolTip_GetToolCount',
-            'GUIToolTip_GetToolInfo','GUIToolTip_HitTest',
-            'GUIToolTip_NewToolRect','GUIToolTip_Pop','GUIToolTip_PopUp',
-            'GUIToolTip_SetDelayTime','GUIToolTip_SetMargin',
-            'GUIToolTip_SetMaxTipWidth','GUIToolTip_SetTipBkColor',
-            'GUIToolTip_SetTipTextColor','GUIToolTip_SetTitle',
-            'GUIToolTip_SetToolInfo','GUIToolTip_SetWindowTheme',
-            'GUIToolTip_ToolExists','GUIToolTip_ToolToArray',
-            'GUIToolTip_TrackActivate','GUIToolTip_TrackPosition',
-            'GUIToolTip_TTFToBits','GUIToolTip_Update',
-            'GUIToolTip_UpdateTipText','HexToString','IE_Example',
-            'IE_Introduction','IE_VersionInfo','IEAction','IEAttach',
-            'IEBodyReadHTML','IEBodyReadText','IEBodyWriteHTML','IECreate',
-            'IECreateEmbedded','IEDocGetObj','IEDocInsertHTML',
-            'IEDocInsertText','IEDocReadHTML','IEDocWriteHTML',
-            'IEErrorHandlerDeRegister','IEErrorHandlerRegister','IEErrorNotify',
-            'IEFormElementCheckBoxSelect','IEFormElementGetCollection',
-            'IEFormElementGetObjByName','IEFormElementGetValue',
-            'IEFormElementOptionSelect','IEFormElementRadioSelect',
-            'IEFormElementSetValue','IEFormGetCollection','IEFormGetObjByName',
-            'IEFormImageClick','IEFormReset','IEFormSubmit',
-            'IEFrameGetCollection','IEFrameGetObjByName','IEGetObjById',
-            'IEGetObjByName','IEHeadInsertEventScript','IEImgClick',
-            'IEImgGetCollection','IEIsFrameSet','IELinkClickByIndex',
-            'IELinkClickByText','IELinkGetCollection','IELoadWait',
-            'IELoadWaitTimeout','IENavigate','IEPropertyGet','IEPropertySet',
-            'IEQuit','IETableGetCollection','IETableWriteToArray',
-            'IETagNameAllGetCollection','IETagNameGetCollection','Iif',
-            'INetExplorerCapable','INetGetSource','INetMail','INetSmtpMail',
-            'IsPressed','MathCheckDiv','Max','MemGlobalAlloc','MemGlobalFree',
-            'MemGlobalLock','MemGlobalSize','MemGlobalUnlock','MemMoveMemory',
-            'MemMsgBox','MemShowError','MemVirtualAlloc','MemVirtualAllocEx',
-            'MemVirtualFree','MemVirtualFreeEx','Min','MouseTrap',
-            'NamedPipes_CallNamedPipe','NamedPipes_ConnectNamedPipe',
-            'NamedPipes_CreateNamedPipe','NamedPipes_CreatePipe',
+            'GUIScrollBars_GetScrollInfo', 'GUIScrollBars_GetScrollInfoEx',
+            'GUIScrollBars_GetScrollInfoMax', 'GUIScrollBars_GetScrollInfoMin',
+            'GUIScrollBars_GetScrollInfoPage', 'GUIScrollBars_GetScrollInfoPos',
+            'GUIScrollBars_GetScrollInfoTrackPos', 'GUIScrollBars_GetScrollPos',
+            'GUIScrollBars_GetScrollRange', 'GUIScrollBars_Init',
+            'GUIScrollBars_ScrollWindow', 'GUIScrollBars_SetScrollInfo',
+            'GUIScrollBars_SetScrollInfoMax', 'GUIScrollBars_SetScrollInfoMin',
+            'GUIScrollBars_SetScrollInfoPage', 'GUIScrollBars_SetScrollInfoPos',
+            'GUIScrollBars_SetScrollRange', 'GUIScrollBars_ShowScrollBar',
+            'GUIToolTip_Activate', 'GUIToolTip_AddTool', 'GUIToolTip_AdjustRect',
+            'GUIToolTip_BitsToTTF', 'GUIToolTip_Create', 'GUIToolTip_Deactivate',
+            'GUIToolTip_DelTool', 'GUIToolTip_Destroy', 'GUIToolTip_EnumTools',
+            'GUIToolTip_GetBubbleHeight', 'GUIToolTip_GetBubbleSize',
+            'GUIToolTip_GetBubbleWidth', 'GUIToolTip_GetCurrentTool',
+            'GUIToolTip_GetDelayTime', 'GUIToolTip_GetMargin',
+            'GUIToolTip_GetMarginEx', 'GUIToolTip_GetMaxTipWidth',
+            'GUIToolTip_GetText', 'GUIToolTip_GetTipBkColor',
+            'GUIToolTip_GetTipTextColor', 'GUIToolTip_GetTitleBitMap',
+            'GUIToolTip_GetTitleText', 'GUIToolTip_GetToolCount',
+            'GUIToolTip_GetToolInfo', 'GUIToolTip_HitTest',
+            'GUIToolTip_NewToolRect', 'GUIToolTip_Pop', 'GUIToolTip_PopUp',
+            'GUIToolTip_SetDelayTime', 'GUIToolTip_SetMargin',
+            'GUIToolTip_SetMaxTipWidth', 'GUIToolTip_SetTipBkColor',
+            'GUIToolTip_SetTipTextColor', 'GUIToolTip_SetTitle',
+            'GUIToolTip_SetToolInfo', 'GUIToolTip_SetWindowTheme',
+            'GUIToolTip_ToolExists', 'GUIToolTip_ToolToArray',
+            'GUIToolTip_TrackActivate', 'GUIToolTip_TrackPosition',
+            'GUIToolTip_Update', 'GUIToolTip_UpdateTipText', 'HexToString',
+            'IEAction', 'IEAttach', 'IEBodyReadHTML', 'IEBodyReadText',
+            'IEBodyWriteHTML', 'IECreate', 'IECreateEmbedded', 'IEDocGetObj',
+            'IEDocInsertHTML', 'IEDocInsertText', 'IEDocReadHTML',
+            'IEDocWriteHTML', 'IEErrorNotify', 'IEFormElementCheckBoxSelect',
+            'IEFormElementGetCollection', 'IEFormElementGetObjByName',
+            'IEFormElementGetValue', 'IEFormElementOptionSelect',
+            'IEFormElementRadioSelect', 'IEFormElementSetValue',
+            'IEFormGetCollection', 'IEFormGetObjByName', 'IEFormImageClick',
+            'IEFormReset', 'IEFormSubmit', 'IEFrameGetCollection',
+            'IEFrameGetObjByName', 'IEGetObjById', 'IEGetObjByName',
+            'IEHeadInsertEventScript', 'IEImgClick', 'IEImgGetCollection',
+            'IEIsFrameSet', 'IELinkClickByIndex', 'IELinkClickByText',
+            'IELinkGetCollection', 'IELoadWait', 'IELoadWaitTimeout', 'IENavigate',
+            'IEPropertyGet', 'IEPropertySet', 'IEQuit', 'IETableGetCollection',
+            'IETableWriteToArray', 'IETagNameAllGetCollection',
+            'IETagNameGetCollection', 'IE_Example', 'IE_Introduction',
+            'IE_VersionInfo', 'INetExplorerCapable', 'INetGetSource', 'INetMail',
+            'INetSmtpMail', 'IsPressed', 'MathCheckDiv', 'Max', 'MemGlobalAlloc',
+            'MemGlobalFree', 'MemGlobalLock', 'MemGlobalSize', 'MemGlobalUnlock',
+            'MemMoveMemory', 'MemVirtualAlloc', 'MemVirtualAllocEx',
+            'MemVirtualFree', 'MemVirtualFreeEx', 'Min', 'MouseTrap',
+            'NamedPipes_CallNamedPipe', 'NamedPipes_ConnectNamedPipe',
+            'NamedPipes_CreateNamedPipe', 'NamedPipes_CreatePipe',
             'NamedPipes_DisconnectNamedPipe',
-            'NamedPipes_GetNamedPipeHandleState','NamedPipes_GetNamedPipeInfo',
-            'NamedPipes_PeekNamedPipe','NamedPipes_SetNamedPipeHandleState',
-            'NamedPipes_TransactNamedPipe','NamedPipes_WaitNamedPipe',
-            'Net_Share_ConnectionEnum','Net_Share_FileClose',
-            'Net_Share_FileEnum','Net_Share_FileGetInfo','Net_Share_PermStr',
-            'Net_Share_ResourceStr','Net_Share_SessionDel',
-            'Net_Share_SessionEnum','Net_Share_SessionGetInfo',
-            'Net_Share_ShareAdd','Net_Share_ShareCheck','Net_Share_ShareDel',
-            'Net_Share_ShareEnum','Net_Share_ShareGetInfo',
-            'Net_Share_ShareSetInfo','Net_Share_StatisticsGetSvr',
-            'Net_Share_StatisticsGetWrk','Now','NowCalc','NowCalcDate',
-            'NowDate','NowTime','PathFull','PathMake','PathSplit',
-            'ProcessGetName','ProcessGetPriority','Radian',
-            'ReplaceStringInFile','RunDOS','ScreenCapture_Capture',
-            'ScreenCapture_CaptureWnd','ScreenCapture_SaveImage',
-            'ScreenCapture_SetBMPFormat','ScreenCapture_SetJPGQuality',
-            'ScreenCapture_SetTIFColorDepth','ScreenCapture_SetTIFCompression',
-            'Security__AdjustTokenPrivileges','Security__GetAccountSid',
-            'Security__GetLengthSid','Security__GetTokenInformation',
-            'Security__ImpersonateSelf','Security__IsValidSid',
-            'Security__LookupAccountName','Security__LookupAccountSid',
-            'Security__LookupPrivilegeValue','Security__OpenProcessToken',
-            'Security__OpenThreadToken','Security__OpenThreadTokenEx',
-            'Security__SetPrivilege','Security__SidToStringSid',
-            'Security__SidTypeStr','Security__StringSidToSid','SendMessage',
-            'SendMessageA','SetDate','SetTime','Singleton','SoundClose',
-            'SoundLength','SoundOpen','SoundPause','SoundPlay','SoundPos',
-            'SoundResume','SoundSeek','SoundStatus','SoundStop',
-            'SQLite_Changes','SQLite_Close','SQLite_Display2DResult',
-            'SQLite_Encode','SQLite_ErrCode','SQLite_ErrMsg','SQLite_Escape',
-            'SQLite_Exec','SQLite_FetchData','SQLite_FetchNames',
-            'SQLite_GetTable','SQLite_GetTable2d','SQLite_LastInsertRowID',
-            'SQLite_LibVersion','SQLite_Open','SQLite_Query',
-            'SQLite_QueryFinalize','SQLite_QueryReset','SQLite_QuerySingleRow',
-            'SQLite_SaveMode','SQLite_SetTimeout','SQLite_Shutdown',
-            'SQLite_SQLiteExe','SQLite_Startup','SQLite_TotalChanges',
-            'StringAddComma','StringBetween','StringEncrypt','StringInsert',
-            'StringProper','StringRepeat','StringReverse','StringSplit',
-            'StringToHex','TCPIpToName','TempFile','TicksToTime','Timer_Diff',
-            'Timer_GetTimerID','Timer_Init','Timer_KillAllTimers',
-            'Timer_KillTimer','Timer_SetTimer','TimeToTicks','VersionCompare',
-            'viClose','viExecCommand','viFindGpib','viGpibBusReset','viGTL',
-            'viOpen','viSetAttribute','viSetTimeout','WeekNumberISO',
-            'WinAPI_AttachConsole','WinAPI_AttachThreadInput','WinAPI_Beep',
-            'WinAPI_BitBlt','WinAPI_CallNextHookEx','WinAPI_Check',
-            'WinAPI_ClientToScreen','WinAPI_CloseHandle',
-            'WinAPI_CommDlgExtendedError','WinAPI_CopyIcon',
-            'WinAPI_CreateBitmap','WinAPI_CreateCompatibleBitmap',
-            'WinAPI_CreateCompatibleDC','WinAPI_CreateEvent',
-            'WinAPI_CreateFile','WinAPI_CreateFont','WinAPI_CreateFontIndirect',
-            'WinAPI_CreateProcess','WinAPI_CreateSolidBitmap',
-            'WinAPI_CreateSolidBrush','WinAPI_CreateWindowEx',
-            'WinAPI_DefWindowProc','WinAPI_DeleteDC','WinAPI_DeleteObject',
-            'WinAPI_DestroyIcon','WinAPI_DestroyWindow','WinAPI_DrawEdge',
-            'WinAPI_DrawFrameControl','WinAPI_DrawIcon','WinAPI_DrawIconEx',
-            'WinAPI_DrawText','WinAPI_EnableWindow','WinAPI_EnumDisplayDevices',
-            'WinAPI_EnumWindows','WinAPI_EnumWindowsPopup',
-            'WinAPI_EnumWindowsTop','WinAPI_ExpandEnvironmentStrings',
-            'WinAPI_ExtractIconEx','WinAPI_FatalAppExit','WinAPI_FillRect',
-            'WinAPI_FindExecutable','WinAPI_FindWindow','WinAPI_FlashWindow',
-            'WinAPI_FlashWindowEx','WinAPI_FloatToInt',
-            'WinAPI_FlushFileBuffers','WinAPI_FormatMessage','WinAPI_FrameRect',
-            'WinAPI_FreeLibrary','WinAPI_GetAncestor','WinAPI_GetAsyncKeyState',
-            'WinAPI_GetClassName','WinAPI_GetClientHeight',
-            'WinAPI_GetClientRect','WinAPI_GetClientWidth',
-            'WinAPI_GetCurrentProcess','WinAPI_GetCurrentProcessID',
-            'WinAPI_GetCurrentThread','WinAPI_GetCurrentThreadId',
-            'WinAPI_GetCursorInfo','WinAPI_GetDC','WinAPI_GetDesktopWindow',
-            'WinAPI_GetDeviceCaps','WinAPI_GetDIBits','WinAPI_GetDlgCtrlID',
-            'WinAPI_GetDlgItem','WinAPI_GetFileSizeEx','WinAPI_GetFocus',
-            'WinAPI_GetForegroundWindow','WinAPI_GetIconInfo',
-            'WinAPI_GetLastError','WinAPI_GetLastErrorMessage',
-            'WinAPI_GetModuleHandle','WinAPI_GetMousePos','WinAPI_GetMousePosX',
-            'WinAPI_GetMousePosY','WinAPI_GetObject','WinAPI_GetOpenFileName',
-            'WinAPI_GetOverlappedResult','WinAPI_GetParent',
-            'WinAPI_GetProcessAffinityMask','WinAPI_GetSaveFileName',
-            'WinAPI_GetStdHandle','WinAPI_GetStockObject','WinAPI_GetSysColor',
-            'WinAPI_GetSysColorBrush','WinAPI_GetSystemMetrics',
-            'WinAPI_GetTextExtentPoint32','WinAPI_GetWindow',
-            'WinAPI_GetWindowDC','WinAPI_GetWindowHeight',
-            'WinAPI_GetWindowLong','WinAPI_GetWindowRect',
-            'WinAPI_GetWindowText','WinAPI_GetWindowThreadProcessId',
-            'WinAPI_GetWindowWidth','WinAPI_GetXYFromPoint',
-            'WinAPI_GlobalMemStatus','WinAPI_GUIDFromString',
-            'WinAPI_GUIDFromStringEx','WinAPI_HiWord','WinAPI_InProcess',
-            'WinAPI_IntToFloat','WinAPI_InvalidateRect','WinAPI_IsClassName',
-            'WinAPI_IsWindow','WinAPI_IsWindowVisible','WinAPI_LoadBitmap',
-            'WinAPI_LoadImage','WinAPI_LoadLibrary','WinAPI_LoadLibraryEx',
-            'WinAPI_LoadShell32Icon','WinAPI_LoadString','WinAPI_LocalFree',
-            'WinAPI_LoWord','WinAPI_MakeDWord','WinAPI_MAKELANGID',
-            'WinAPI_MAKELCID','WinAPI_MakeLong','WinAPI_MessageBeep',
-            'WinAPI_Mouse_Event','WinAPI_MoveWindow','WinAPI_MsgBox',
-            'WinAPI_MulDiv','WinAPI_MultiByteToWideChar',
-            'WinAPI_MultiByteToWideCharEx','WinAPI_OpenProcess',
-            'WinAPI_PointFromRect','WinAPI_PostMessage','WinAPI_PrimaryLangId',
-            'WinAPI_PtInRect','WinAPI_ReadFile','WinAPI_ReadProcessMemory',
-            'WinAPI_RectIsEmpty','WinAPI_RedrawWindow',
-            'WinAPI_RegisterWindowMessage','WinAPI_ReleaseCapture',
-            'WinAPI_ReleaseDC','WinAPI_ScreenToClient','WinAPI_SelectObject',
-            'WinAPI_SetBkColor','WinAPI_SetCapture','WinAPI_SetCursor',
-            'WinAPI_SetDefaultPrinter','WinAPI_SetDIBits','WinAPI_SetEvent',
-            'WinAPI_SetFocus','WinAPI_SetFont','WinAPI_SetHandleInformation',
-            'WinAPI_SetLastError','WinAPI_SetParent',
-            'WinAPI_SetProcessAffinityMask','WinAPI_SetSysColors',
-            'WinAPI_SetTextColor','WinAPI_SetWindowLong','WinAPI_SetWindowPos',
-            'WinAPI_SetWindowsHookEx','WinAPI_SetWindowText',
-            'WinAPI_ShowCursor','WinAPI_ShowError','WinAPI_ShowMsg',
-            'WinAPI_ShowWindow','WinAPI_StringFromGUID','WinAPI_SubLangId',
-            'WinAPI_SystemParametersInfo','WinAPI_TwipsPerPixelX',
-            'WinAPI_TwipsPerPixelY','WinAPI_UnhookWindowsHookEx',
-            'WinAPI_UpdateLayeredWindow','WinAPI_UpdateWindow',
-            'WinAPI_ValidateClassName','WinAPI_WaitForInputIdle',
-            'WinAPI_WaitForMultipleObjects','WinAPI_WaitForSingleObject',
-            'WinAPI_WideCharToMultiByte','WinAPI_WindowFromPoint',
-            'WinAPI_WriteConsole','WinAPI_WriteFile',
-            'WinAPI_WriteProcessMemory','WinNet_AddConnection',
-            'WinNet_AddConnection2','WinNet_AddConnection3',
-            'WinNet_CancelConnection','WinNet_CancelConnection2',
-            'WinNet_CloseEnum','WinNet_ConnectionDialog',
-            'WinNet_ConnectionDialog1','WinNet_DisconnectDialog',
-            'WinNet_DisconnectDialog1','WinNet_EnumResource',
-            'WinNet_GetConnection','WinNet_GetConnectionPerformance',
-            'WinNet_GetLastError','WinNet_GetNetworkInformation',
-            'WinNet_GetProviderName','WinNet_GetResourceInformation',
-            'WinNet_GetResourceParent','WinNet_GetUniversalName',
-            'WinNet_GetUser','WinNet_OpenEnum','WinNet_RestoreConnection',
-            'WinNet_UseConnection','Word_VersionInfo','WordAttach','WordCreate',
-            'WordDocAdd','WordDocAddLink','WordDocAddPicture','WordDocClose',
-            'WordDocFindReplace','WordDocGetCollection',
-            'WordDocLinkGetCollection','WordDocOpen','WordDocPrint',
-            'WordDocPropertyGet','WordDocPropertySet','WordDocSave',
-            'WordDocSaveAs','WordErrorHandlerDeRegister',
-            'WordErrorHandlerRegister','WordErrorNotify','WordMacroRun',
-            'WordPropertyGet','WordPropertySet','WordQuit'
-            ),
+            'NamedPipes_GetNamedPipeHandleState', 'NamedPipes_GetNamedPipeInfo',
+            'NamedPipes_PeekNamedPipe', 'NamedPipes_SetNamedPipeHandleState',
+            'NamedPipes_TransactNamedPipe', 'NamedPipes_WaitNamedPipe',
+            'Net_Share_ConnectionEnum', 'Net_Share_FileClose',
+            'Net_Share_FileEnum', 'Net_Share_FileGetInfo', 'Net_Share_PermStr',
+            'Net_Share_ResourceStr', 'Net_Share_SessionDel',
+            'Net_Share_SessionEnum', 'Net_Share_SessionGetInfo',
+            'Net_Share_ShareAdd', 'Net_Share_ShareCheck', 'Net_Share_ShareDel',
+            'Net_Share_ShareEnum', 'Net_Share_ShareGetInfo',
+            'Net_Share_ShareSetInfo', 'Net_Share_StatisticsGetSvr',
+            'Net_Share_StatisticsGetWrk', 'Now', 'NowCalc', 'NowCalcDate',
+            'NowDate', 'NowTime', 'PathFull', 'PathGetRelative', 'PathMake',
+            'PathSplit', 'ProcessGetName', 'ProcessGetPriority', 'Radian',
+            'ReplaceStringInFile', 'RunDos', 'ScreenCapture_Capture',
+            'ScreenCapture_CaptureWnd', 'ScreenCapture_SaveImage',
+            'ScreenCapture_SetBMPFormat', 'ScreenCapture_SetJPGQuality',
+            'ScreenCapture_SetTIFColorDepth', 'ScreenCapture_SetTIFCompression',
+            'Security__AdjustTokenPrivileges',
+            'Security__CreateProcessWithToken', 'Security__DuplicateTokenEx',
+            'Security__GetAccountSid', 'Security__GetLengthSid',
+            'Security__GetTokenInformation', 'Security__ImpersonateSelf',
+            'Security__IsValidSid', 'Security__LookupAccountName',
+            'Security__LookupAccountSid', 'Security__LookupPrivilegeValue',
+            'Security__OpenProcessToken', 'Security__OpenThreadToken',
+            'Security__OpenThreadTokenEx', 'Security__SetPrivilege',
+            'Security__SetTokenInformation', 'Security__SidToStringSid',
+            'Security__SidTypeStr', 'Security__StringSidToSid', 'SendMessage',
+            'SendMessageA', 'SetDate', 'SetTime', 'Singleton', 'SoundClose',
+            'SoundLength', 'SoundOpen', 'SoundPause', 'SoundPlay', 'SoundPos',
+            'SoundResume', 'SoundSeek', 'SoundStatus', 'SoundStop',
+            'SQLite_Changes', 'SQLite_Close', 'SQLite_Display2DResult',
+            'SQLite_Encode', 'SQLite_ErrCode', 'SQLite_ErrMsg', 'SQLite_Escape',
+            'SQLite_Exec', 'SQLite_FastEncode', 'SQLite_FastEscape',
+            'SQLite_FetchData', 'SQLite_FetchNames', 'SQLite_GetTable',
+            'SQLite_GetTable2d', 'SQLite_LastInsertRowID', 'SQLite_LibVersion',
+            'SQLite_Open', 'SQLite_Query', 'SQLite_QueryFinalize',
+            'SQLite_QueryReset', 'SQLite_QuerySingleRow', 'SQLite_SafeMode',
+            'SQLite_SetTimeout', 'SQLite_Shutdown', 'SQLite_SQLiteExe',
+            'SQLite_Startup', 'SQLite_TotalChanges', 'StringBetween',
+            'StringExplode', 'StringInsert', 'StringProper', 'StringRepeat',
+            'StringTitleCase', 'StringToHex', 'TCPIpToName', 'TempFile',
+            'TicksToTime', 'Timer_Diff', 'Timer_GetIdleTime', 'Timer_GetTimerID',
+            'Timer_Init', 'Timer_KillAllTimers', 'Timer_KillTimer',
+            'Timer_SetTimer', 'TimeToTicks', 'VersionCompare', 'viClose',
+            'viExecCommand', 'viFindGpib', 'viGpibBusReset', 'viGTL',
+            'viInteractiveControl', 'viOpen', 'viSetAttribute', 'viSetTimeout',
+            'WeekNumberISO', 'WinAPI_AbortPath', 'WinAPI_ActivateKeyboardLayout',
+            'WinAPI_AddClipboardFormatListener', 'WinAPI_AddFontMemResourceEx',
+            'WinAPI_AddFontResourceEx', 'WinAPI_AddIconOverlay',
+            'WinAPI_AddIconTransparency', 'WinAPI_AddMRUString',
+            'WinAPI_AdjustBitmap', 'WinAPI_AdjustTokenPrivileges',
+            'WinAPI_AdjustWindowRectEx', 'WinAPI_AlphaBlend', 'WinAPI_AngleArc',
+            'WinAPI_AnimateWindow', 'WinAPI_Arc', 'WinAPI_ArcTo',
+            'WinAPI_ArrayToStruct', 'WinAPI_AssignProcessToJobObject',
+            'WinAPI_AssocGetPerceivedType', 'WinAPI_AssocQueryString',
+            'WinAPI_AttachConsole', 'WinAPI_AttachThreadInput',
+            'WinAPI_BackupRead', 'WinAPI_BackupReadAbort', 'WinAPI_BackupSeek',
+            'WinAPI_BackupWrite', 'WinAPI_BackupWriteAbort', 'WinAPI_Beep',
+            'WinAPI_BeginBufferedPaint', 'WinAPI_BeginDeferWindowPos',
+            'WinAPI_BeginPaint', 'WinAPI_BeginPath', 'WinAPI_BeginUpdateResource',
+            'WinAPI_BitBlt', 'WinAPI_BringWindowToTop',
+            'WinAPI_BroadcastSystemMessage', 'WinAPI_BrowseForFolderDlg',
+            'WinAPI_BufferedPaintClear', 'WinAPI_BufferedPaintInit',
+            'WinAPI_BufferedPaintSetAlpha', 'WinAPI_BufferedPaintUnInit',
+            'WinAPI_CallNextHookEx', 'WinAPI_CallWindowProc',
+            'WinAPI_CallWindowProcW', 'WinAPI_CascadeWindows',
+            'WinAPI_ChangeWindowMessageFilterEx', 'WinAPI_CharToOem',
+            'WinAPI_ChildWindowFromPointEx', 'WinAPI_ClientToScreen',
+            'WinAPI_ClipCursor', 'WinAPI_CloseDesktop', 'WinAPI_CloseEnhMetaFile',
+            'WinAPI_CloseFigure', 'WinAPI_CloseHandle', 'WinAPI_CloseThemeData',
+            'WinAPI_CloseWindow', 'WinAPI_CloseWindowStation',
+            'WinAPI_CLSIDFromProgID', 'WinAPI_CoInitialize',
+            'WinAPI_ColorAdjustLuma', 'WinAPI_ColorHLSToRGB',
+            'WinAPI_ColorRGBToHLS', 'WinAPI_CombineRgn',
+            'WinAPI_CombineTransform', 'WinAPI_CommandLineToArgv',
+            'WinAPI_CommDlgExtendedError', 'WinAPI_CommDlgExtendedErrorEx',
+            'WinAPI_CompareString', 'WinAPI_CompressBitmapBits',
+            'WinAPI_CompressBuffer', 'WinAPI_ComputeCrc32',
+            'WinAPI_ConfirmCredentials', 'WinAPI_CopyBitmap', 'WinAPI_CopyCursor',
+            'WinAPI_CopyEnhMetaFile', 'WinAPI_CopyFileEx', 'WinAPI_CopyIcon',
+            'WinAPI_CopyImage', 'WinAPI_CopyRect', 'WinAPI_CopyStruct',
+            'WinAPI_CoTaskMemAlloc', 'WinAPI_CoTaskMemFree',
+            'WinAPI_CoTaskMemRealloc', 'WinAPI_CoUninitialize',
+            'WinAPI_Create32BitHBITMAP', 'WinAPI_Create32BitHICON',
+            'WinAPI_CreateANDBitmap', 'WinAPI_CreateBitmap',
+            'WinAPI_CreateBitmapIndirect', 'WinAPI_CreateBrushIndirect',
+            'WinAPI_CreateBuffer', 'WinAPI_CreateBufferFromStruct',
+            'WinAPI_CreateCaret', 'WinAPI_CreateColorAdjustment',
+            'WinAPI_CreateCompatibleBitmap', 'WinAPI_CreateCompatibleBitmapEx',
+            'WinAPI_CreateCompatibleDC', 'WinAPI_CreateDesktop',
+            'WinAPI_CreateDIB', 'WinAPI_CreateDIBColorTable',
+            'WinAPI_CreateDIBitmap', 'WinAPI_CreateDIBSection',
+            'WinAPI_CreateDirectory', 'WinAPI_CreateDirectoryEx',
+            'WinAPI_CreateEllipticRgn', 'WinAPI_CreateEmptyIcon',
+            'WinAPI_CreateEnhMetaFile', 'WinAPI_CreateEvent', 'WinAPI_CreateFile',
+            'WinAPI_CreateFileEx', 'WinAPI_CreateFileMapping',
+            'WinAPI_CreateFont', 'WinAPI_CreateFontEx',
+            'WinAPI_CreateFontIndirect', 'WinAPI_CreateGUID',
+            'WinAPI_CreateHardLink', 'WinAPI_CreateIcon',
+            'WinAPI_CreateIconFromResourceEx', 'WinAPI_CreateIconIndirect',
+            'WinAPI_CreateJobObject', 'WinAPI_CreateMargins',
+            'WinAPI_CreateMRUList', 'WinAPI_CreateMutex', 'WinAPI_CreateNullRgn',
+            'WinAPI_CreateNumberFormatInfo', 'WinAPI_CreateObjectID',
+            'WinAPI_CreatePen', 'WinAPI_CreatePoint', 'WinAPI_CreatePolygonRgn',
+            'WinAPI_CreateProcess', 'WinAPI_CreateProcessWithToken',
+            'WinAPI_CreateRect', 'WinAPI_CreateRectEx', 'WinAPI_CreateRectRgn',
+            'WinAPI_CreateRectRgnIndirect', 'WinAPI_CreateRoundRectRgn',
+            'WinAPI_CreateSemaphore', 'WinAPI_CreateSize',
+            'WinAPI_CreateSolidBitmap', 'WinAPI_CreateSolidBrush',
+            'WinAPI_CreateStreamOnHGlobal', 'WinAPI_CreateString',
+            'WinAPI_CreateSymbolicLink', 'WinAPI_CreateTransform',
+            'WinAPI_CreateWindowEx', 'WinAPI_CreateWindowStation',
+            'WinAPI_DecompressBuffer', 'WinAPI_DecryptFile',
+            'WinAPI_DeferWindowPos', 'WinAPI_DefineDosDevice',
+            'WinAPI_DefRawInputProc', 'WinAPI_DefSubclassProc',
+            'WinAPI_DefWindowProc', 'WinAPI_DefWindowProcW', 'WinAPI_DeleteDC',
+            'WinAPI_DeleteEnhMetaFile', 'WinAPI_DeleteFile',
+            'WinAPI_DeleteObject', 'WinAPI_DeleteObjectID',
+            'WinAPI_DeleteVolumeMountPoint', 'WinAPI_DeregisterShellHookWindow',
+            'WinAPI_DestroyCaret', 'WinAPI_DestroyCursor', 'WinAPI_DestroyIcon',
+            'WinAPI_DestroyWindow', 'WinAPI_DeviceIoControl',
+            'WinAPI_DisplayStruct', 'WinAPI_DllGetVersion', 'WinAPI_DllInstall',
+            'WinAPI_DllUninstall', 'WinAPI_DPtoLP', 'WinAPI_DragAcceptFiles',
+            'WinAPI_DragFinish', 'WinAPI_DragQueryFileEx',
+            'WinAPI_DragQueryPoint', 'WinAPI_DrawAnimatedRects',
+            'WinAPI_DrawBitmap', 'WinAPI_DrawEdge', 'WinAPI_DrawFocusRect',
+            'WinAPI_DrawFrameControl', 'WinAPI_DrawIcon', 'WinAPI_DrawIconEx',
+            'WinAPI_DrawLine', 'WinAPI_DrawShadowText', 'WinAPI_DrawText',
+            'WinAPI_DrawThemeBackground', 'WinAPI_DrawThemeEdge',
+            'WinAPI_DrawThemeIcon', 'WinAPI_DrawThemeParentBackground',
+            'WinAPI_DrawThemeText', 'WinAPI_DrawThemeTextEx',
+            'WinAPI_DuplicateEncryptionInfoFile', 'WinAPI_DuplicateHandle',
+            'WinAPI_DuplicateTokenEx', 'WinAPI_DwmDefWindowProc',
+            'WinAPI_DwmEnableBlurBehindWindow', 'WinAPI_DwmEnableComposition',
+            'WinAPI_DwmExtendFrameIntoClientArea',
+            'WinAPI_DwmGetColorizationColor',
+            'WinAPI_DwmGetColorizationParameters',
+            'WinAPI_DwmGetWindowAttribute', 'WinAPI_DwmInvalidateIconicBitmaps',
+            'WinAPI_DwmIsCompositionEnabled',
+            'WinAPI_DwmQueryThumbnailSourceSize', 'WinAPI_DwmRegisterThumbnail',
+            'WinAPI_DwmSetColorizationParameters',
+            'WinAPI_DwmSetIconicLivePreviewBitmap',
+            'WinAPI_DwmSetIconicThumbnail', 'WinAPI_DwmSetWindowAttribute',
+            'WinAPI_DwmUnregisterThumbnail',
+            'WinAPI_DwmUpdateThumbnailProperties', 'WinAPI_DWordToFloat',
+            'WinAPI_DWordToInt', 'WinAPI_EjectMedia', 'WinAPI_Ellipse',
+            'WinAPI_EmptyWorkingSet', 'WinAPI_EnableWindow', 'WinAPI_EncryptFile',
+            'WinAPI_EncryptionDisable', 'WinAPI_EndBufferedPaint',
+            'WinAPI_EndDeferWindowPos', 'WinAPI_EndPaint', 'WinAPI_EndPath',
+            'WinAPI_EndUpdateResource', 'WinAPI_EnumChildProcess',
+            'WinAPI_EnumChildWindows', 'WinAPI_EnumDesktops',
+            'WinAPI_EnumDesktopWindows', 'WinAPI_EnumDeviceDrivers',
+            'WinAPI_EnumDisplayDevices', 'WinAPI_EnumDisplayMonitors',
+            'WinAPI_EnumDisplaySettings', 'WinAPI_EnumDllProc',
+            'WinAPI_EnumFiles', 'WinAPI_EnumFileStreams',
+            'WinAPI_EnumFontFamilies', 'WinAPI_EnumHardLinks',
+            'WinAPI_EnumMRUList', 'WinAPI_EnumPageFiles',
+            'WinAPI_EnumProcessHandles', 'WinAPI_EnumProcessModules',
+            'WinAPI_EnumProcessThreads', 'WinAPI_EnumProcessWindows',
+            'WinAPI_EnumRawInputDevices', 'WinAPI_EnumResourceLanguages',
+            'WinAPI_EnumResourceNames', 'WinAPI_EnumResourceTypes',
+            'WinAPI_EnumSystemGeoID', 'WinAPI_EnumSystemLocales',
+            'WinAPI_EnumUILanguages', 'WinAPI_EnumWindows',
+            'WinAPI_EnumWindowsPopup', 'WinAPI_EnumWindowStations',
+            'WinAPI_EnumWindowsTop', 'WinAPI_EqualMemory', 'WinAPI_EqualRect',
+            'WinAPI_EqualRgn', 'WinAPI_ExcludeClipRect',
+            'WinAPI_ExpandEnvironmentStrings', 'WinAPI_ExtCreatePen',
+            'WinAPI_ExtCreateRegion', 'WinAPI_ExtFloodFill', 'WinAPI_ExtractIcon',
+            'WinAPI_ExtractIconEx', 'WinAPI_ExtSelectClipRgn',
+            'WinAPI_FatalAppExit', 'WinAPI_FatalExit',
+            'WinAPI_FileEncryptionStatus', 'WinAPI_FileExists',
+            'WinAPI_FileIconInit', 'WinAPI_FileInUse', 'WinAPI_FillMemory',
+            'WinAPI_FillPath', 'WinAPI_FillRect', 'WinAPI_FillRgn',
+            'WinAPI_FindClose', 'WinAPI_FindCloseChangeNotification',
+            'WinAPI_FindExecutable', 'WinAPI_FindFirstChangeNotification',
+            'WinAPI_FindFirstFile', 'WinAPI_FindFirstFileName',
+            'WinAPI_FindFirstStream', 'WinAPI_FindNextChangeNotification',
+            'WinAPI_FindNextFile', 'WinAPI_FindNextFileName',
+            'WinAPI_FindNextStream', 'WinAPI_FindResource',
+            'WinAPI_FindResourceEx', 'WinAPI_FindTextDlg', 'WinAPI_FindWindow',
+            'WinAPI_FlashWindow', 'WinAPI_FlashWindowEx', 'WinAPI_FlattenPath',
+            'WinAPI_FloatToDWord', 'WinAPI_FloatToInt', 'WinAPI_FlushFileBuffers',
+            'WinAPI_FlushFRBuffer', 'WinAPI_FlushViewOfFile',
+            'WinAPI_FormatDriveDlg', 'WinAPI_FormatMessage', 'WinAPI_FrameRect',
+            'WinAPI_FrameRgn', 'WinAPI_FreeLibrary', 'WinAPI_FreeMemory',
+            'WinAPI_FreeMRUList', 'WinAPI_FreeResource', 'WinAPI_GdiComment',
+            'WinAPI_GetActiveWindow', 'WinAPI_GetAllUsersProfileDirectory',
+            'WinAPI_GetAncestor', 'WinAPI_GetApplicationRestartSettings',
+            'WinAPI_GetArcDirection', 'WinAPI_GetAsyncKeyState',
+            'WinAPI_GetBinaryType', 'WinAPI_GetBitmapBits',
+            'WinAPI_GetBitmapDimension', 'WinAPI_GetBitmapDimensionEx',
+            'WinAPI_GetBkColor', 'WinAPI_GetBkMode', 'WinAPI_GetBoundsRect',
+            'WinAPI_GetBrushOrg', 'WinAPI_GetBufferedPaintBits',
+            'WinAPI_GetBufferedPaintDC', 'WinAPI_GetBufferedPaintTargetDC',
+            'WinAPI_GetBufferedPaintTargetRect', 'WinAPI_GetBValue',
+            'WinAPI_GetCaretBlinkTime', 'WinAPI_GetCaretPos', 'WinAPI_GetCDType',
+            'WinAPI_GetClassInfoEx', 'WinAPI_GetClassLongEx',
+            'WinAPI_GetClassName', 'WinAPI_GetClientHeight',
+            'WinAPI_GetClientRect', 'WinAPI_GetClientWidth',
+            'WinAPI_GetClipboardSequenceNumber', 'WinAPI_GetClipBox',
+            'WinAPI_GetClipCursor', 'WinAPI_GetClipRgn',
+            'WinAPI_GetColorAdjustment', 'WinAPI_GetCompressedFileSize',
+            'WinAPI_GetCompression', 'WinAPI_GetConnectedDlg',
+            'WinAPI_GetCurrentDirectory', 'WinAPI_GetCurrentHwProfile',
+            'WinAPI_GetCurrentObject', 'WinAPI_GetCurrentPosition',
+            'WinAPI_GetCurrentProcess',
+            'WinAPI_GetCurrentProcessExplicitAppUserModelID',
+            'WinAPI_GetCurrentProcessID', 'WinAPI_GetCurrentThemeName',
+            'WinAPI_GetCurrentThread', 'WinAPI_GetCurrentThreadId',
+            'WinAPI_GetCursor', 'WinAPI_GetCursorInfo', 'WinAPI_GetDateFormat',
+            'WinAPI_GetDC', 'WinAPI_GetDCEx', 'WinAPI_GetDefaultPrinter',
+            'WinAPI_GetDefaultUserProfileDirectory', 'WinAPI_GetDesktopWindow',
+            'WinAPI_GetDeviceCaps', 'WinAPI_GetDeviceDriverBaseName',
+            'WinAPI_GetDeviceDriverFileName', 'WinAPI_GetDeviceGammaRamp',
+            'WinAPI_GetDIBColorTable', 'WinAPI_GetDIBits',
+            'WinAPI_GetDiskFreeSpaceEx', 'WinAPI_GetDlgCtrlID',
+            'WinAPI_GetDlgItem', 'WinAPI_GetDllDirectory',
+            'WinAPI_GetDriveBusType', 'WinAPI_GetDriveGeometryEx',
+            'WinAPI_GetDriveNumber', 'WinAPI_GetDriveType',
+            'WinAPI_GetDurationFormat', 'WinAPI_GetEffectiveClientRect',
+            'WinAPI_GetEnhMetaFile', 'WinAPI_GetEnhMetaFileBits',
+            'WinAPI_GetEnhMetaFileDescription', 'WinAPI_GetEnhMetaFileDimension',
+            'WinAPI_GetEnhMetaFileHeader', 'WinAPI_GetErrorMessage',
+            'WinAPI_GetErrorMode', 'WinAPI_GetExitCodeProcess',
+            'WinAPI_GetExtended', 'WinAPI_GetFileAttributes', 'WinAPI_GetFileID',
+            'WinAPI_GetFileInformationByHandle',
+            'WinAPI_GetFileInformationByHandleEx', 'WinAPI_GetFilePointerEx',
+            'WinAPI_GetFileSizeEx', 'WinAPI_GetFileSizeOnDisk',
+            'WinAPI_GetFileTitle', 'WinAPI_GetFileType',
+            'WinAPI_GetFileVersionInfo', 'WinAPI_GetFinalPathNameByHandle',
+            'WinAPI_GetFinalPathNameByHandleEx', 'WinAPI_GetFocus',
+            'WinAPI_GetFontMemoryResourceInfo', 'WinAPI_GetFontName',
+            'WinAPI_GetFontResourceInfo', 'WinAPI_GetForegroundWindow',
+            'WinAPI_GetFRBuffer', 'WinAPI_GetFullPathName', 'WinAPI_GetGeoInfo',
+            'WinAPI_GetGlyphOutline', 'WinAPI_GetGraphicsMode',
+            'WinAPI_GetGuiResources', 'WinAPI_GetGUIThreadInfo',
+            'WinAPI_GetGValue', 'WinAPI_GetHandleInformation',
+            'WinAPI_GetHGlobalFromStream', 'WinAPI_GetIconDimension',
+            'WinAPI_GetIconInfo', 'WinAPI_GetIconInfoEx', 'WinAPI_GetIdleTime',
+            'WinAPI_GetKeyboardLayout', 'WinAPI_GetKeyboardLayoutList',
+            'WinAPI_GetKeyboardState', 'WinAPI_GetKeyboardType',
+            'WinAPI_GetKeyNameText', 'WinAPI_GetKeyState',
+            'WinAPI_GetLastActivePopup', 'WinAPI_GetLastError',
+            'WinAPI_GetLastErrorMessage', 'WinAPI_GetLayeredWindowAttributes',
+            'WinAPI_GetLocaleInfo', 'WinAPI_GetLogicalDrives',
+            'WinAPI_GetMapMode', 'WinAPI_GetMemorySize',
+            'WinAPI_GetMessageExtraInfo', 'WinAPI_GetModuleFileNameEx',
+            'WinAPI_GetModuleHandle', 'WinAPI_GetModuleHandleEx',
+            'WinAPI_GetModuleInformation', 'WinAPI_GetMonitorInfo',
+            'WinAPI_GetMousePos', 'WinAPI_GetMousePosX', 'WinAPI_GetMousePosY',
+            'WinAPI_GetMUILanguage', 'WinAPI_GetNumberFormat', 'WinAPI_GetObject',
+            'WinAPI_GetObjectID', 'WinAPI_GetObjectInfoByHandle',
+            'WinAPI_GetObjectNameByHandle', 'WinAPI_GetObjectType',
+            'WinAPI_GetOpenFileName', 'WinAPI_GetOutlineTextMetrics',
+            'WinAPI_GetOverlappedResult', 'WinAPI_GetParent',
+            'WinAPI_GetParentProcess', 'WinAPI_GetPerformanceInfo',
+            'WinAPI_GetPEType', 'WinAPI_GetPhysicallyInstalledSystemMemory',
+            'WinAPI_GetPixel', 'WinAPI_GetPolyFillMode', 'WinAPI_GetPosFromRect',
+            'WinAPI_GetPriorityClass', 'WinAPI_GetProcAddress',
+            'WinAPI_GetProcessAffinityMask', 'WinAPI_GetProcessCommandLine',
+            'WinAPI_GetProcessFileName', 'WinAPI_GetProcessHandleCount',
+            'WinAPI_GetProcessID', 'WinAPI_GetProcessIoCounters',
+            'WinAPI_GetProcessMemoryInfo', 'WinAPI_GetProcessName',
+            'WinAPI_GetProcessShutdownParameters', 'WinAPI_GetProcessTimes',
+            'WinAPI_GetProcessUser', 'WinAPI_GetProcessWindowStation',
+            'WinAPI_GetProcessWorkingDirectory', 'WinAPI_GetProfilesDirectory',
+            'WinAPI_GetPwrCapabilities', 'WinAPI_GetRawInputBuffer',
+            'WinAPI_GetRawInputBufferLength', 'WinAPI_GetRawInputData',
+            'WinAPI_GetRawInputDeviceInfo', 'WinAPI_GetRegionData',
+            'WinAPI_GetRegisteredRawInputDevices',
+            'WinAPI_GetRegKeyNameByHandle', 'WinAPI_GetRgnBox', 'WinAPI_GetROP2',
+            'WinAPI_GetRValue', 'WinAPI_GetSaveFileName', 'WinAPI_GetShellWindow',
+            'WinAPI_GetStartupInfo', 'WinAPI_GetStdHandle',
+            'WinAPI_GetStockObject', 'WinAPI_GetStretchBltMode',
+            'WinAPI_GetString', 'WinAPI_GetSysColor', 'WinAPI_GetSysColorBrush',
+            'WinAPI_GetSystemDefaultLangID', 'WinAPI_GetSystemDefaultLCID',
+            'WinAPI_GetSystemDefaultUILanguage', 'WinAPI_GetSystemDEPPolicy',
+            'WinAPI_GetSystemInfo', 'WinAPI_GetSystemMetrics',
+            'WinAPI_GetSystemPowerStatus', 'WinAPI_GetSystemTimes',
+            'WinAPI_GetSystemWow64Directory', 'WinAPI_GetTabbedTextExtent',
+            'WinAPI_GetTempFileName', 'WinAPI_GetTextAlign',
+            'WinAPI_GetTextCharacterExtra', 'WinAPI_GetTextColor',
+            'WinAPI_GetTextExtentPoint32', 'WinAPI_GetTextFace',
+            'WinAPI_GetTextMetrics', 'WinAPI_GetThemeAppProperties',
+            'WinAPI_GetThemeBackgroundContentRect',
+            'WinAPI_GetThemeBackgroundExtent', 'WinAPI_GetThemeBackgroundRegion',
+            'WinAPI_GetThemeBitmap', 'WinAPI_GetThemeBool',
+            'WinAPI_GetThemeColor', 'WinAPI_GetThemeDocumentationProperty',
+            'WinAPI_GetThemeEnumValue', 'WinAPI_GetThemeFilename',
+            'WinAPI_GetThemeFont', 'WinAPI_GetThemeInt', 'WinAPI_GetThemeMargins',
+            'WinAPI_GetThemeMetric', 'WinAPI_GetThemePartSize',
+            'WinAPI_GetThemePosition', 'WinAPI_GetThemePropertyOrigin',
+            'WinAPI_GetThemeRect', 'WinAPI_GetThemeString',
+            'WinAPI_GetThemeSysBool', 'WinAPI_GetThemeSysColor',
+            'WinAPI_GetThemeSysColorBrush', 'WinAPI_GetThemeSysFont',
+            'WinAPI_GetThemeSysInt', 'WinAPI_GetThemeSysSize',
+            'WinAPI_GetThemeSysString', 'WinAPI_GetThemeTextExtent',
+            'WinAPI_GetThemeTextMetrics', 'WinAPI_GetThemeTransitionDuration',
+            'WinAPI_GetThreadDesktop', 'WinAPI_GetThreadErrorMode',
+            'WinAPI_GetThreadLocale', 'WinAPI_GetThreadUILanguage',
+            'WinAPI_GetTickCount', 'WinAPI_GetTickCount64',
+            'WinAPI_GetTimeFormat', 'WinAPI_GetTopWindow',
+            'WinAPI_GetUDFColorMode', 'WinAPI_GetUpdateRect',
+            'WinAPI_GetUpdateRgn', 'WinAPI_GetUserDefaultLangID',
+            'WinAPI_GetUserDefaultLCID', 'WinAPI_GetUserDefaultUILanguage',
+            'WinAPI_GetUserGeoID', 'WinAPI_GetUserObjectInformation',
+            'WinAPI_GetVersion', 'WinAPI_GetVersionEx',
+            'WinAPI_GetVolumeInformation', 'WinAPI_GetVolumeInformationByHandle',
+            'WinAPI_GetVolumeNameForVolumeMountPoint', 'WinAPI_GetWindow',
+            'WinAPI_GetWindowDC', 'WinAPI_GetWindowDisplayAffinity',
+            'WinAPI_GetWindowExt', 'WinAPI_GetWindowFileName',
+            'WinAPI_GetWindowHeight', 'WinAPI_GetWindowInfo',
+            'WinAPI_GetWindowLong', 'WinAPI_GetWindowOrg',
+            'WinAPI_GetWindowPlacement', 'WinAPI_GetWindowRect',
+            'WinAPI_GetWindowRgn', 'WinAPI_GetWindowRgnBox',
+            'WinAPI_GetWindowSubclass', 'WinAPI_GetWindowText',
+            'WinAPI_GetWindowTheme', 'WinAPI_GetWindowThreadProcessId',
+            'WinAPI_GetWindowWidth', 'WinAPI_GetWorkArea',
+            'WinAPI_GetWorldTransform', 'WinAPI_GetXYFromPoint',
+            'WinAPI_GlobalMemoryStatus', 'WinAPI_GradientFill',
+            'WinAPI_GUIDFromString', 'WinAPI_GUIDFromStringEx', 'WinAPI_HashData',
+            'WinAPI_HashString', 'WinAPI_HiByte', 'WinAPI_HideCaret',
+            'WinAPI_HiDWord', 'WinAPI_HiWord', 'WinAPI_InflateRect',
+            'WinAPI_InitMUILanguage', 'WinAPI_InProcess',
+            'WinAPI_IntersectClipRect', 'WinAPI_IntersectRect',
+            'WinAPI_IntToDWord', 'WinAPI_IntToFloat', 'WinAPI_InvalidateRect',
+            'WinAPI_InvalidateRgn', 'WinAPI_InvertANDBitmap',
+            'WinAPI_InvertColor', 'WinAPI_InvertRect', 'WinAPI_InvertRgn',
+            'WinAPI_IOCTL', 'WinAPI_IsAlphaBitmap', 'WinAPI_IsBadCodePtr',
+            'WinAPI_IsBadReadPtr', 'WinAPI_IsBadStringPtr',
+            'WinAPI_IsBadWritePtr', 'WinAPI_IsChild', 'WinAPI_IsClassName',
+            'WinAPI_IsDoorOpen', 'WinAPI_IsElevated', 'WinAPI_IsHungAppWindow',
+            'WinAPI_IsIconic', 'WinAPI_IsInternetConnected',
+            'WinAPI_IsLoadKBLayout', 'WinAPI_IsMemory',
+            'WinAPI_IsNameInExpression', 'WinAPI_IsNetworkAlive',
+            'WinAPI_IsPathShared', 'WinAPI_IsProcessInJob',
+            'WinAPI_IsProcessorFeaturePresent', 'WinAPI_IsRectEmpty',
+            'WinAPI_IsThemeActive',
+            'WinAPI_IsThemeBackgroundPartiallyTransparent',
+            'WinAPI_IsThemePartDefined', 'WinAPI_IsValidLocale',
+            'WinAPI_IsWindow', 'WinAPI_IsWindowEnabled', 'WinAPI_IsWindowUnicode',
+            'WinAPI_IsWindowVisible', 'WinAPI_IsWow64Process',
+            'WinAPI_IsWritable', 'WinAPI_IsZoomed', 'WinAPI_Keybd_Event',
+            'WinAPI_KillTimer', 'WinAPI_LineDDA', 'WinAPI_LineTo',
+            'WinAPI_LoadBitmap', 'WinAPI_LoadCursor', 'WinAPI_LoadCursorFromFile',
+            'WinAPI_LoadIcon', 'WinAPI_LoadIconMetric',
+            'WinAPI_LoadIconWithScaleDown', 'WinAPI_LoadImage',
+            'WinAPI_LoadIndirectString', 'WinAPI_LoadKeyboardLayout',
+            'WinAPI_LoadLibrary', 'WinAPI_LoadLibraryEx', 'WinAPI_LoadMedia',
+            'WinAPI_LoadResource', 'WinAPI_LoadShell32Icon', 'WinAPI_LoadString',
+            'WinAPI_LoadStringEx', 'WinAPI_LoByte', 'WinAPI_LocalFree',
+            'WinAPI_LockDevice', 'WinAPI_LockFile', 'WinAPI_LockResource',
+            'WinAPI_LockWindowUpdate', 'WinAPI_LockWorkStation', 'WinAPI_LoDWord',
+            'WinAPI_LongMid', 'WinAPI_LookupIconIdFromDirectoryEx',
+            'WinAPI_LoWord', 'WinAPI_LPtoDP', 'WinAPI_MAKELANGID',
+            'WinAPI_MAKELCID', 'WinAPI_MakeLong', 'WinAPI_MakeQWord',
+            'WinAPI_MakeWord', 'WinAPI_MapViewOfFile', 'WinAPI_MapVirtualKey',
+            'WinAPI_MaskBlt', 'WinAPI_MessageBeep', 'WinAPI_MessageBoxCheck',
+            'WinAPI_MessageBoxIndirect', 'WinAPI_MirrorIcon',
+            'WinAPI_ModifyWorldTransform', 'WinAPI_MonitorFromPoint',
+            'WinAPI_MonitorFromRect', 'WinAPI_MonitorFromWindow',
+            'WinAPI_Mouse_Event', 'WinAPI_MoveFileEx', 'WinAPI_MoveMemory',
+            'WinAPI_MoveTo', 'WinAPI_MoveToEx', 'WinAPI_MoveWindow',
+            'WinAPI_MsgBox', 'WinAPI_MulDiv', 'WinAPI_MultiByteToWideChar',
+            'WinAPI_MultiByteToWideCharEx', 'WinAPI_NtStatusToDosError',
+            'WinAPI_OemToChar', 'WinAPI_OffsetClipRgn', 'WinAPI_OffsetPoints',
+            'WinAPI_OffsetRect', 'WinAPI_OffsetRgn', 'WinAPI_OffsetWindowOrg',
+            'WinAPI_OpenDesktop', 'WinAPI_OpenFileById', 'WinAPI_OpenFileDlg',
+            'WinAPI_OpenFileMapping', 'WinAPI_OpenIcon',
+            'WinAPI_OpenInputDesktop', 'WinAPI_OpenJobObject', 'WinAPI_OpenMutex',
+            'WinAPI_OpenProcess', 'WinAPI_OpenProcessToken',
+            'WinAPI_OpenSemaphore', 'WinAPI_OpenThemeData',
+            'WinAPI_OpenWindowStation', 'WinAPI_PageSetupDlg',
+            'WinAPI_PaintDesktop', 'WinAPI_PaintRgn', 'WinAPI_ParseURL',
+            'WinAPI_ParseUserName', 'WinAPI_PatBlt', 'WinAPI_PathAddBackslash',
+            'WinAPI_PathAddExtension', 'WinAPI_PathAppend',
+            'WinAPI_PathBuildRoot', 'WinAPI_PathCanonicalize',
+            'WinAPI_PathCommonPrefix', 'WinAPI_PathCompactPath',
+            'WinAPI_PathCompactPathEx', 'WinAPI_PathCreateFromUrl',
+            'WinAPI_PathFindExtension', 'WinAPI_PathFindFileName',
+            'WinAPI_PathFindNextComponent', 'WinAPI_PathFindOnPath',
+            'WinAPI_PathGetArgs', 'WinAPI_PathGetCharType',
+            'WinAPI_PathGetDriveNumber', 'WinAPI_PathIsContentType',
+            'WinAPI_PathIsDirectory', 'WinAPI_PathIsDirectoryEmpty',
+            'WinAPI_PathIsExe', 'WinAPI_PathIsFileSpec',
+            'WinAPI_PathIsLFNFileSpec', 'WinAPI_PathIsRelative',
+            'WinAPI_PathIsRoot', 'WinAPI_PathIsSameRoot',
+            'WinAPI_PathIsSystemFolder', 'WinAPI_PathIsUNC',
+            'WinAPI_PathIsUNCServer', 'WinAPI_PathIsUNCServerShare',
+            'WinAPI_PathMakeSystemFolder', 'WinAPI_PathMatchSpec',
+            'WinAPI_PathParseIconLocation', 'WinAPI_PathRelativePathTo',
+            'WinAPI_PathRemoveArgs', 'WinAPI_PathRemoveBackslash',
+            'WinAPI_PathRemoveExtension', 'WinAPI_PathRemoveFileSpec',
+            'WinAPI_PathRenameExtension', 'WinAPI_PathSearchAndQualify',
+            'WinAPI_PathSkipRoot', 'WinAPI_PathStripPath',
+            'WinAPI_PathStripToRoot', 'WinAPI_PathToRegion',
+            'WinAPI_PathUndecorate', 'WinAPI_PathUnExpandEnvStrings',
+            'WinAPI_PathUnmakeSystemFolder', 'WinAPI_PathUnquoteSpaces',
+            'WinAPI_PathYetAnotherMakeUniqueName', 'WinAPI_PickIconDlg',
+            'WinAPI_PlayEnhMetaFile', 'WinAPI_PlaySound', 'WinAPI_PlgBlt',
+            'WinAPI_PointFromRect', 'WinAPI_PolyBezier', 'WinAPI_PolyBezierTo',
+            'WinAPI_PolyDraw', 'WinAPI_Polygon', 'WinAPI_PostMessage',
+            'WinAPI_PrimaryLangId', 'WinAPI_PrintDlg', 'WinAPI_PrintDlgEx',
+            'WinAPI_PrintWindow', 'WinAPI_ProgIDFromCLSID', 'WinAPI_PtInRect',
+            'WinAPI_PtInRectEx', 'WinAPI_PtInRegion', 'WinAPI_PtVisible',
+            'WinAPI_QueryDosDevice', 'WinAPI_QueryInformationJobObject',
+            'WinAPI_QueryPerformanceCounter', 'WinAPI_QueryPerformanceFrequency',
+            'WinAPI_RadialGradientFill', 'WinAPI_ReadDirectoryChanges',
+            'WinAPI_ReadFile', 'WinAPI_ReadProcessMemory', 'WinAPI_Rectangle',
+            'WinAPI_RectInRegion', 'WinAPI_RectIsEmpty', 'WinAPI_RectVisible',
+            'WinAPI_RedrawWindow', 'WinAPI_RegCloseKey',
+            'WinAPI_RegConnectRegistry', 'WinAPI_RegCopyTree',
+            'WinAPI_RegCopyTreeEx', 'WinAPI_RegCreateKey',
+            'WinAPI_RegDeleteEmptyKey', 'WinAPI_RegDeleteKey',
+            'WinAPI_RegDeleteKeyValue', 'WinAPI_RegDeleteTree',
+            'WinAPI_RegDeleteTreeEx', 'WinAPI_RegDeleteValue',
+            'WinAPI_RegDisableReflectionKey', 'WinAPI_RegDuplicateHKey',
+            'WinAPI_RegEnableReflectionKey', 'WinAPI_RegEnumKey',
+            'WinAPI_RegEnumValue', 'WinAPI_RegFlushKey',
+            'WinAPI_RegisterApplicationRestart', 'WinAPI_RegisterClass',
+            'WinAPI_RegisterClassEx', 'WinAPI_RegisterHotKey',
+            'WinAPI_RegisterPowerSettingNotification',
+            'WinAPI_RegisterRawInputDevices', 'WinAPI_RegisterShellHookWindow',
+            'WinAPI_RegisterWindowMessage', 'WinAPI_RegLoadMUIString',
+            'WinAPI_RegNotifyChangeKeyValue', 'WinAPI_RegOpenKey',
+            'WinAPI_RegQueryInfoKey', 'WinAPI_RegQueryLastWriteTime',
+            'WinAPI_RegQueryMultipleValues', 'WinAPI_RegQueryReflectionKey',
+            'WinAPI_RegQueryValue', 'WinAPI_RegRestoreKey', 'WinAPI_RegSaveKey',
+            'WinAPI_RegSetValue', 'WinAPI_ReleaseCapture', 'WinAPI_ReleaseDC',
+            'WinAPI_ReleaseMutex', 'WinAPI_ReleaseSemaphore',
+            'WinAPI_ReleaseStream', 'WinAPI_RemoveClipboardFormatListener',
+            'WinAPI_RemoveDirectory', 'WinAPI_RemoveFontMemResourceEx',
+            'WinAPI_RemoveFontResourceEx', 'WinAPI_RemoveWindowSubclass',
+            'WinAPI_ReOpenFile', 'WinAPI_ReplaceFile', 'WinAPI_ReplaceTextDlg',
+            'WinAPI_ResetEvent', 'WinAPI_RestartDlg', 'WinAPI_RestoreDC',
+            'WinAPI_RGB', 'WinAPI_RotatePoints', 'WinAPI_RoundRect',
+            'WinAPI_SaveDC', 'WinAPI_SaveFileDlg', 'WinAPI_SaveHBITMAPToFile',
+            'WinAPI_SaveHICONToFile', 'WinAPI_ScaleWindowExt',
+            'WinAPI_ScreenToClient', 'WinAPI_SearchPath', 'WinAPI_SelectClipPath',
+            'WinAPI_SelectClipRgn', 'WinAPI_SelectObject',
+            'WinAPI_SendMessageTimeout', 'WinAPI_SetActiveWindow',
+            'WinAPI_SetArcDirection', 'WinAPI_SetBitmapBits',
+            'WinAPI_SetBitmapDimensionEx', 'WinAPI_SetBkColor',
+            'WinAPI_SetBkMode', 'WinAPI_SetBoundsRect', 'WinAPI_SetBrushOrg',
+            'WinAPI_SetCapture', 'WinAPI_SetCaretBlinkTime', 'WinAPI_SetCaretPos',
+            'WinAPI_SetClassLongEx', 'WinAPI_SetColorAdjustment',
+            'WinAPI_SetCompression', 'WinAPI_SetCurrentDirectory',
+            'WinAPI_SetCurrentProcessExplicitAppUserModelID', 'WinAPI_SetCursor',
+            'WinAPI_SetDCBrushColor', 'WinAPI_SetDCPenColor',
+            'WinAPI_SetDefaultPrinter', 'WinAPI_SetDeviceGammaRamp',
+            'WinAPI_SetDIBColorTable', 'WinAPI_SetDIBits',
+            'WinAPI_SetDIBitsToDevice', 'WinAPI_SetDllDirectory',
+            'WinAPI_SetEndOfFile', 'WinAPI_SetEnhMetaFileBits',
+            'WinAPI_SetErrorMode', 'WinAPI_SetEvent', 'WinAPI_SetFileAttributes',
+            'WinAPI_SetFileInformationByHandleEx', 'WinAPI_SetFilePointer',
+            'WinAPI_SetFilePointerEx', 'WinAPI_SetFileShortName',
+            'WinAPI_SetFileValidData', 'WinAPI_SetFocus', 'WinAPI_SetFont',
+            'WinAPI_SetForegroundWindow', 'WinAPI_SetFRBuffer',
+            'WinAPI_SetGraphicsMode', 'WinAPI_SetHandleInformation',
+            'WinAPI_SetInformationJobObject', 'WinAPI_SetKeyboardLayout',
+            'WinAPI_SetKeyboardState', 'WinAPI_SetLastError',
+            'WinAPI_SetLayeredWindowAttributes', 'WinAPI_SetLocaleInfo',
+            'WinAPI_SetMapMode', 'WinAPI_SetMessageExtraInfo', 'WinAPI_SetParent',
+            'WinAPI_SetPixel', 'WinAPI_SetPolyFillMode',
+            'WinAPI_SetPriorityClass', 'WinAPI_SetProcessAffinityMask',
+            'WinAPI_SetProcessShutdownParameters',
+            'WinAPI_SetProcessWindowStation', 'WinAPI_SetRectRgn',
+            'WinAPI_SetROP2', 'WinAPI_SetSearchPathMode',
+            'WinAPI_SetStretchBltMode', 'WinAPI_SetSysColors',
+            'WinAPI_SetSystemCursor', 'WinAPI_SetTextAlign',
+            'WinAPI_SetTextCharacterExtra', 'WinAPI_SetTextColor',
+            'WinAPI_SetTextJustification', 'WinAPI_SetThemeAppProperties',
+            'WinAPI_SetThreadDesktop', 'WinAPI_SetThreadErrorMode',
+            'WinAPI_SetThreadExecutionState', 'WinAPI_SetThreadLocale',
+            'WinAPI_SetThreadUILanguage', 'WinAPI_SetTimer',
+            'WinAPI_SetUDFColorMode', 'WinAPI_SetUserGeoID',
+            'WinAPI_SetUserObjectInformation', 'WinAPI_SetVolumeMountPoint',
+            'WinAPI_SetWindowDisplayAffinity', 'WinAPI_SetWindowExt',
+            'WinAPI_SetWindowLong', 'WinAPI_SetWindowOrg',
+            'WinAPI_SetWindowPlacement', 'WinAPI_SetWindowPos',
+            'WinAPI_SetWindowRgn', 'WinAPI_SetWindowsHookEx',
+            'WinAPI_SetWindowSubclass', 'WinAPI_SetWindowText',
+            'WinAPI_SetWindowTheme', 'WinAPI_SetWinEventHook',
+            'WinAPI_SetWorldTransform', 'WinAPI_SfcIsFileProtected',
+            'WinAPI_SfcIsKeyProtected', 'WinAPI_ShellAboutDlg',
+            'WinAPI_ShellAddToRecentDocs', 'WinAPI_ShellChangeNotify',
+            'WinAPI_ShellChangeNotifyDeregister',
+            'WinAPI_ShellChangeNotifyRegister', 'WinAPI_ShellCreateDirectory',
+            'WinAPI_ShellEmptyRecycleBin', 'WinAPI_ShellExecute',
+            'WinAPI_ShellExecuteEx', 'WinAPI_ShellExtractAssociatedIcon',
+            'WinAPI_ShellExtractIcon', 'WinAPI_ShellFileOperation',
+            'WinAPI_ShellFlushSFCache', 'WinAPI_ShellGetFileInfo',
+            'WinAPI_ShellGetIconOverlayIndex', 'WinAPI_ShellGetImageList',
+            'WinAPI_ShellGetKnownFolderIDList', 'WinAPI_ShellGetKnownFolderPath',
+            'WinAPI_ShellGetLocalizedName', 'WinAPI_ShellGetPathFromIDList',
+            'WinAPI_ShellGetSetFolderCustomSettings', 'WinAPI_ShellGetSettings',
+            'WinAPI_ShellGetSpecialFolderLocation',
+            'WinAPI_ShellGetSpecialFolderPath', 'WinAPI_ShellGetStockIconInfo',
+            'WinAPI_ShellILCreateFromPath', 'WinAPI_ShellNotifyIcon',
+            'WinAPI_ShellNotifyIconGetRect', 'WinAPI_ShellObjectProperties',
+            'WinAPI_ShellOpenFolderAndSelectItems', 'WinAPI_ShellOpenWithDlg',
+            'WinAPI_ShellQueryRecycleBin',
+            'WinAPI_ShellQueryUserNotificationState',
+            'WinAPI_ShellRemoveLocalizedName', 'WinAPI_ShellRestricted',
+            'WinAPI_ShellSetKnownFolderPath', 'WinAPI_ShellSetLocalizedName',
+            'WinAPI_ShellSetSettings', 'WinAPI_ShellStartNetConnectionDlg',
+            'WinAPI_ShellUpdateImage', 'WinAPI_ShellUserAuthenticationDlg',
+            'WinAPI_ShellUserAuthenticationDlgEx', 'WinAPI_ShortToWord',
+            'WinAPI_ShowCaret', 'WinAPI_ShowCursor', 'WinAPI_ShowError',
+            'WinAPI_ShowLastError', 'WinAPI_ShowMsg', 'WinAPI_ShowOwnedPopups',
+            'WinAPI_ShowWindow', 'WinAPI_ShutdownBlockReasonCreate',
+            'WinAPI_ShutdownBlockReasonDestroy',
+            'WinAPI_ShutdownBlockReasonQuery', 'WinAPI_SizeOfResource',
+            'WinAPI_StretchBlt', 'WinAPI_StretchDIBits',
+            'WinAPI_StrFormatByteSize', 'WinAPI_StrFormatByteSizeEx',
+            'WinAPI_StrFormatKBSize', 'WinAPI_StrFromTimeInterval',
+            'WinAPI_StringFromGUID', 'WinAPI_StringLenA', 'WinAPI_StringLenW',
+            'WinAPI_StrLen', 'WinAPI_StrokeAndFillPath', 'WinAPI_StrokePath',
+            'WinAPI_StructToArray', 'WinAPI_SubLangId', 'WinAPI_SubtractRect',
+            'WinAPI_SwapDWord', 'WinAPI_SwapQWord', 'WinAPI_SwapWord',
+            'WinAPI_SwitchColor', 'WinAPI_SwitchDesktop',
+            'WinAPI_SwitchToThisWindow', 'WinAPI_SystemParametersInfo',
+            'WinAPI_TabbedTextOut', 'WinAPI_TerminateJobObject',
+            'WinAPI_TerminateProcess', 'WinAPI_TextOut', 'WinAPI_TileWindows',
+            'WinAPI_TrackMouseEvent', 'WinAPI_TransparentBlt',
+            'WinAPI_TwipsPerPixelX', 'WinAPI_TwipsPerPixelY',
+            'WinAPI_UnhookWindowsHookEx', 'WinAPI_UnhookWinEvent',
+            'WinAPI_UnionRect', 'WinAPI_UnionStruct', 'WinAPI_UniqueHardwareID',
+            'WinAPI_UnloadKeyboardLayout', 'WinAPI_UnlockFile',
+            'WinAPI_UnmapViewOfFile', 'WinAPI_UnregisterApplicationRestart',
+            'WinAPI_UnregisterClass', 'WinAPI_UnregisterHotKey',
+            'WinAPI_UnregisterPowerSettingNotification',
+            'WinAPI_UpdateLayeredWindow', 'WinAPI_UpdateLayeredWindowEx',
+            'WinAPI_UpdateLayeredWindowIndirect', 'WinAPI_UpdateResource',
+            'WinAPI_UpdateWindow', 'WinAPI_UrlApplyScheme',
+            'WinAPI_UrlCanonicalize', 'WinAPI_UrlCombine', 'WinAPI_UrlCompare',
+            'WinAPI_UrlCreateFromPath', 'WinAPI_UrlFixup', 'WinAPI_UrlGetPart',
+            'WinAPI_UrlHash', 'WinAPI_UrlIs', 'WinAPI_UserHandleGrantAccess',
+            'WinAPI_ValidateRect', 'WinAPI_ValidateRgn', 'WinAPI_VerQueryRoot',
+            'WinAPI_VerQueryValue', 'WinAPI_VerQueryValueEx',
+            'WinAPI_WaitForInputIdle', 'WinAPI_WaitForMultipleObjects',
+            'WinAPI_WaitForSingleObject', 'WinAPI_WideCharToMultiByte',
+            'WinAPI_WidenPath', 'WinAPI_WindowFromDC', 'WinAPI_WindowFromPoint',
+            'WinAPI_WordToShort', 'WinAPI_Wow64EnableWow64FsRedirection',
+            'WinAPI_WriteConsole', 'WinAPI_WriteFile',
+            'WinAPI_WriteProcessMemory', 'WinAPI_ZeroMemory',
+            'WinNet_AddConnection', 'WinNet_AddConnection2',
+            'WinNet_AddConnection3', 'WinNet_CancelConnection',
+            'WinNet_CancelConnection2', 'WinNet_CloseEnum',
+            'WinNet_ConnectionDialog', 'WinNet_ConnectionDialog1',
+            'WinNet_DisconnectDialog', 'WinNet_DisconnectDialog1',
+            'WinNet_EnumResource', 'WinNet_GetConnection',
+            'WinNet_GetConnectionPerformance', 'WinNet_GetLastError',
+            'WinNet_GetNetworkInformation', 'WinNet_GetProviderName',
+            'WinNet_GetResourceInformation', 'WinNet_GetResourceParent',
+            'WinNet_GetUniversalName', 'WinNet_GetUser', 'WinNet_OpenEnum',
+            'WinNet_RestoreConnection', 'WinNet_UseConnection', 'Word_Create',
+            'Word_DocAdd', 'Word_DocAttach', 'Word_DocClose', 'Word_DocExport',
+            'Word_DocFind', 'Word_DocFindReplace', 'Word_DocGet',
+            'Word_DocLinkAdd', 'Word_DocLinkGet', 'Word_DocOpen',
+            'Word_DocPictureAdd', 'Word_DocPrint', 'Word_DocRangeSet',
+            'Word_DocSave', 'Word_DocSaveAs', 'Word_DocTableRead',
+            'Word_DocTableWrite', 'Word_Quit'
+        ),
         5 => array(
-            'ce','comments-end','comments-start','cs','include','include-once',
-            'NoTrayIcon','RequireAdmin'
-            ),
+            'ce', 'comments-end', 'comments-start', 'cs'
+        ),
         6 => array(
-            'AutoIt3Wrapper_Au3Check_Parameters',
-            'AutoIt3Wrapper_Au3Check_Stop_OnWarning',
-            'AutoIt3Wrapper_Change2CUI','AutoIt3Wrapper_Compression',
-            'AutoIt3Wrapper_cvsWrapper_Parameters','AutoIt3Wrapper_Icon',
-            'AutoIt3Wrapper_Outfile','AutoIt3Wrapper_Outfile_Type',
-            'AutoIt3Wrapper_Plugin_Funcs','AutoIt3Wrapper_Res_Comment',
-            'AutoIt3Wrapper_Res_Description','AutoIt3Wrapper_Res_Field',
-            'AutoIt3Wrapper_Res_File_Add','AutoIt3Wrapper_Res_Fileversion',
+            'Au3Stripper_Ignore_Funcs', 'Au3Stripper_Ignore_Variables',
+            'Au3Stripper_Off', 'Au3Stripper_On', 'Au3Stripper_Parameters',
+            'AutoIt3Wrapper_Add_Constants', 'AutoIt3Wrapper_Au3Check_Parameters',
+            'AutoIt3Wrapper_Au3Check_Stop_OnWarning', 'AutoIt3Wrapper_Aut2Exe',
+            'AutoIt3Wrapper_AutoIt3', 'AutoIt3Wrapper_AutoIt3Dir',
+            'AutoIt3Wrapper_Change2CUI', 'AutoIt3Wrapper_Compile_Both',
+            'AutoIt3Wrapper_Compression', 'AutoIt3Wrapper_EndIf',
+            'AutoIt3Wrapper_Icon', 'AutoIt3Wrapper_If_Compile',
+            'AutoIt3Wrapper_If_Run', 'AutoIt3Wrapper_Jump_To_First_Error',
+            'AutoIt3Wrapper_OutFile', 'AutoIt3Wrapper_OutFile_Type',
+            'AutoIt3Wrapper_OutFile_X64', 'AutoIt3Wrapper_PlugIn_Funcs',
+            'AutoIt3Wrapper_Res_Comment', 'Autoit3Wrapper_Res_Compatibility',
+            'AutoIt3Wrapper_Res_Description', 'AutoIt3Wrapper_Res_Field',
+            'AutoIt3Wrapper_Res_File_Add', 'AutoIt3Wrapper_Res_FileVersion',
             'AutoIt3Wrapper_Res_FileVersion_AutoIncrement',
-            'AutoIt3Wrapper_Res_Icon_Add','AutoIt3Wrapper_Res_Language',
+            'AutoIt3Wrapper_Res_Icon_Add', 'AutoIt3Wrapper_Res_Language',
             'AutoIt3Wrapper_Res_LegalCopyright',
-            'AutoIt3Wrapper_res_requestedExecutionLevel',
-            'AutoIt3Wrapper_Res_SaveSource','AutoIt3Wrapper_Run_After',
-            'AutoIt3Wrapper_Run_Au3check','AutoIt3Wrapper_Run_Before',
-            'AutoIt3Wrapper_Run_cvsWrapper','AutoIt3Wrapper_Run_Debug_Mode',
-            'AutoIt3Wrapper_Run_Obfuscator','AutoIt3Wrapper_Run_Tidy',
-            'AutoIt3Wrapper_Tidy_Stop_OnError','AutoIt3Wrapper_UseAnsi',
-            'AutoIt3Wrapper_UseUpx','AutoIt3Wrapper_UseX64',
-            'AutoIt3Wrapper_Version','EndRegion','forceref',
-            'Obfuscator_Ignore_Funcs','Obfuscator_Ignore_Variables',
-            'Obfuscator_Parameters','Region','Tidy_Parameters'
-            )
+            'AutoIt3Wrapper_Res_ProductVersion',
+            'AutoIt3Wrapper_Res_requestedExecutionLevel',
+            'AutoIt3Wrapper_Res_SaveSource', 'AutoIt3Wrapper_Run_After',
+            'AutoIt3Wrapper_Run_Au3Check', 'AutoIt3Wrapper_Run_Au3Stripper',
+            'AutoIt3Wrapper_Run_Before', 'AutoIt3Wrapper_Run_Debug_Mode',
+            'AutoIt3Wrapper_Run_SciTE_Minimized',
+            'AutoIt3Wrapper_Run_SciTE_OutputPane_Minimized',
+            'AutoIt3Wrapper_Run_Tidy', 'AutoIt3Wrapper_ShowProgress',
+            'AutoIt3Wrapper_Testing', 'AutoIt3Wrapper_Tidy_Stop_OnError',
+            'AutoIt3Wrapper_UPX_Parameters', 'AutoIt3Wrapper_UseUPX',
+            'AutoIt3Wrapper_UseX64', 'AutoIt3Wrapper_Version',
+            'AutoIt3Wrapper_Versioning', 'AutoIt3Wrapper_Versioning_Parameters',
+            'Tidy_Off', 'Tidy_On', 'Tidy_Parameters', 'EndRegion', 'Region'
         ),
+        7 => array(
+            'APPSKEY', 'BACKSPACE', 'BROWSER_BACK', 'BROWSER_FAVORITES',
+            'BROWSER_FORWARD', 'BROWSER_HOME', 'BROWSER_REFRESH', 'BROWSER_SEARCH',
+            'BROWSER_STOP', 'BS', 'CAPSLOCK', 'DEL', 'DELETE', 'DOWN', 'END', 'ENTER',
+            'ESC', 'ESCAPE', 'F1', 'F10', 'F11', 'F12', 'F2', 'F3', 'F4', 'F5', 'F6', 'F7',
+            'F8', 'F9', 'HOME', 'INS', 'INSERT', 'LAUNCH_APP1', 'LAUNCH_APP2',
+            'LAUNCH_MAIL', 'LAUNCH_MEDIA', 'LEFT', 'MEDIA_NEXT', 'MEDIA_PLAY_PAUSE',
+            'MEDIA_PREV', 'MEDIA_STOP', 'NUMLOCK', 'NUMPAD0', 'NUMPAD1', 'NUMPAD2',
+            'NUMPAD3', 'NUMPAD4', 'NUMPAD5', 'NUMPAD6', 'NUMPAD7', 'NUMPAD8',
+            'NUMPAD9', 'NUMPADADD', 'NUMPADDIV', 'NUMPADDOT', 'NUMPADENTER',
+            'NUMPADMULT', 'NUMPADSUB', 'PAUSE', 'PGDN', 'PGUP', 'PRINTSCREEN',
+            'RIGHT', 'SCROLLLOCK', 'SLEEP', 'SPACE', 'TAB', 'UP', 'VOLUME_DOWN',
+            'VOLUME_MUTE', 'VOLUME_UP'
+        ),
+        8 => array(
+            'include', 'include-once', 'NoTrayIcon', 'OnAutoItStartRegister',
+            'RequireAdmin'
+        ),
+        9 => array(
+            'pragma'
+        ),
+        10 => array(
+            'forcedef', 'forceref', 'ignorefunc'
+        ),
+    ),
     'SYMBOLS' => array(
-        '(',')','[',']',
-        '+','-','*','/','&','^',
-        '=','+=','-=','*=','/=','&=',
-        '==','<','<=','>','>=',
-        ',','.'
+        0 => array('(', ')', '[', ']',
+            '+', '-', '*', '/', '&', '^', ':', '?',
+            '=', '==', '+=', '-=', '*=', '/=', '&=',
+            '<', '<=', '>', '>=',
+            ',', '.'
         ),
+        1 => array('_' // Undersore for continuation of strings.
+        ),
+    ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
         1 => false,
@@ -1092,71 +1777,88 @@ $language_data = array (
         3 => false,
         4 => false,
         5 => false,
-        6 => false
-        ),
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false
+    ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #0000FF; font-weight: bold;',
-            2 => 'color: #800000; font-weight: bold;',
-            3 => 'color: #000080; font-style: italic; font-weight: bold;',
-            4 => 'color: #0080FF; font-style: italic; font-weight: bold;',
-            5 => 'color: #F000FF; font-style: italic;',
-            6 => 'color: #A00FF0; font-style: italic;'
-            ),
+            1 => 'color: #0000FF;', // Keywords
+            2 => 'color: #808000;', // Macros
+            3 => 'color: #000090;', // Native Functions
+            4 => 'color: #0080FF;', // UDF Functions
+            5 => 'color: #808000;', // Comments
+            6 => 'color: #DC143C;', // Directives
+            7 => 'color: #5A5A5A;', // Keylist
+            8 => 'color: #808000;', // PreProcessor
+            9 => 'color: #DC143C;', // Pragma
+            10 => 'color: #DC143C;' // Au3Check
+        ),
         'COMMENTS' => array(
-            'MULTI' => 'font-style: italic; color: #669900;',
-            0 => 'font-style: italic; color: #009933;',
-            1 => 'font-style: italic; color: #9977BB;',
-            ),
+            0 => 'color: #FF0000; font-style: italic',
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;',
+        ),
         'ESCAPE_CHAR' => array(
             0 => ''
-            ),
+        ),
         'BRACKETS' => array(
-            0 => 'color: #FF0000; font-weight: bold;'
-            ),
+            0 => 'color: #FF8000;'
+        ),
         'STRINGS' => array(
-            0 => 'font-weight: bold; color: #9977BB;'
-            ),
+            0 => 'color: #FF0000;'
+        ),
         'NUMBERS' => array(
-            0 => 'color: #AC00A9; font-style: italic; font-weight: bold;'
-            ),
+            0 => 'color: #0000FF;'
+        ),
         'METHODS' => array(
-            1 => 'color: #0000FF; font-style: italic; font-weight: bold;'
-            ),
+            1 => 'color: #FF0000;'
+        ),
         'SYMBOLS' => array(
-            0 => 'color: #FF0000; font-weight: bold;'
-            ),
+            0 => 'color: #FF8000;',
+            1 => 'color: #000000;'
+        ),
         'REGEXPS' => array(
-            0 => 'font-weight: bold; color: #AA0000;'
-            ),
-        'SCRIPT' => array(
-            )
+            0 => 'color: #5A5A5A;', // Variables
+            1 => 'color: #5A5A5A;' // Keylist
         ),
+        'SCRIPT' => array()
+    ),
     'URLS' => array(
-        1 => 'http://www.autoitscript.com/autoit3/docs/keywords.htm',
-        2 => 'http://www.autoitscript.com/autoit3/docs/macros.htm',
-        3 => 'http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
+        1 => 'https://www.autoitscript.com/autoit3/docs/keywords.htm', // Keywords
+        2 => 'https://www.autoitscript.com/autoit3/docs/macros.htm#{FNAME}', // Macros
+        3 => 'https://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm', // Native Functions
+        4 => 'https://www.autoitscript.com/autoit3/docs/libfunctions/_{FNAME}.htm', // UDF Functions
+        5 => 'https://www.autoitscript.com/autoit3/docs/keywords/comments-start.htm', // Comments
+        6 => 'https://www.autoitscript.com/autoit3/scite/docs/AutoIt3Wrapper.html', // Directives
+        7 => 'https://www.autoitscript.com/autoit3/docs/appendix/SendKeys.htm#KeysList', // Keylist
+        8 => 'https://www.autoitscript.com/autoit3/docs/keywords/{FNAME}.htm', // PreProcessor
+        9 => 'https://www.autoitscript.com/autoit3/docs/keywords/{FNAME}.htm', // Pragma
+        10 => 'https://www.autoitscript.com/autoit3/docs/intro/au3check.htm' // Au3Check
+    ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
         1 => '.'
-        ),
+    ),
     'REGEXPS' => array(
-        //Variables
-        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*'
-        ),
+        0 => '\$[a-zA-Z0-9_]*', // Variables
+        1 => '\\{[a-zA-Z0-9_]+\\}' // Keylist
+    ),
     'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
+    'SCRIPT_DELIMITERS' => array(),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         0 => true,
         1 => true,
         2 => true,
         3 => true
-        ),
+    ),
     'PARSER_CONTROL' => array(
         'KEYWORDS' => array(
             4 => array(
@@ -1166,7 +1868,20 @@ $language_data = array (
                 'DISALLOWED_BEFORE' => '(?<!\w)\#'
             ),
             6 => array(
-                'DISALLOWED_BEFORE' => '(?<!\w)\#'
+                'DISALLOWED_BEFORE' => '(?<!\w)\#',
+                'DISALLOWED_AFTER' => '(?<!=)[^\r\n]*'
+            ),
+            8 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\#',
+                'DISALLOWED_AFTER' => '(?<!=)[^\r\n]*'
+            ),
+            9 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\#',
+                'DISALLOWED_AFTER' => '(?<!=)[^\r\n]*'
+            ),
+            10 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\#',
+                'DISALLOWED_AFTER' => '(?<!=)[^\r\n]*'
             )
         )
     )
diff --git a/htdocs/application/libraries/geshi/geshi/avisynth.php b/htdocs/application/libraries/geshi/geshi/avisynth.php
index f259b5c..cbd8a12 100644
--- a/htdocs/application/libraries/geshi/geshi/avisynth.php
+++ b/htdocs/application/libraries/geshi/geshi/avisynth.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Ryan Jones (sciguyryan@gmail.com)
  * Copyright: (c) 2008 Ryan Jones
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/10/08
  *
  * AviSynth language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/awk.php b/htdocs/application/libraries/geshi/geshi/awk.php
index d1bc141..e94e64f 100644
--- a/htdocs/application/libraries/geshi/geshi/awk.php
+++ b/htdocs/application/libraries/geshi/geshi/awk.php
@@ -4,7 +4,7 @@
  * -------
  * Author: George Pollard (porges@porg.es)
  * Copyright: (c) 2009 George Pollard
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/01/28
  *
  * Awk language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/bascomavr.php b/htdocs/application/libraries/geshi/geshi/bascomavr.php
index d913135..96ec609 100644
--- a/htdocs/application/libraries/geshi/geshi/bascomavr.php
+++ b/htdocs/application/libraries/geshi/geshi/bascomavr.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: aquaticus.info
  * Copyright: (c) 2008 aquaticus.info
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/01/09
  *
  * BASCOM AVR language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/bash.php b/htdocs/application/libraries/geshi/geshi/bash.php
index e81b75a..d975215 100644
--- a/htdocs/application/libraries/geshi/geshi/bash.php
+++ b/htdocs/application/libraries/geshi/geshi/bash.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Andreas Gohr (andi@splitbrain.org)
  * Copyright: (c) 2004 Andreas Gohr, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/20
  *
  * BASH language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/basic4gl.php b/htdocs/application/libraries/geshi/geshi/basic4gl.php
index b0574ce..499428f 100644
--- a/htdocs/application/libraries/geshi/geshi/basic4gl.php
+++ b/htdocs/application/libraries/geshi/geshi/basic4gl.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Matthew Webb (bmatthew1@blueyonder.co.uk)
  * Copyright: (c) 2004 Matthew Webb (http://matthew-4gl.wikispaces.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/09/15
  *
  * Basic4GL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/batch.php b/htdocs/application/libraries/geshi/geshi/batch.php
new file mode 100644
index 0000000..03a972e
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/batch.php
@@ -0,0 +1,228 @@
+<?php
+/*************************************************************************************
+ * batch.php
+ * ------------
+ * Author: FraidZZ ( fraidzz [@] bk.ru )
+ * Copyright: (c) 2015 FraidZZ ( http://vk.com/fraidzz , http://www.cyberforum.ru/members/340557.html )
+ * Release Version: 1.0.9.0
+ * Date Started: 2015/03/28
+ *
+ * Windows batch file language file for GeSHi.
+ *
+ *************************************************************************************
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Windows Batch file',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        100 => '/(?:^|[&|])\\s*(?:rem|::)[^\\n]*/msi',
+        101 => '/[\\/-]\\S*/si',
+        102 => '/^\s*:[^:]\\S*/msi',
+        103 => '/(?:([%!])[^"\'~ ][^"\' ]*\\1|%%?(?:~[dpnxsatz]*)?[^"\'])/si'
+    ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        100 => '/(?:([%!])\\S+\\1|%%(?:~[dpnxsatz]*)?[^"\'])/si'
+    ),
+    'KEYWORDS' => array(
+        1 => array(
+            'echo',
+            'set',
+            'for',
+            'if',
+            'exit',
+            'else',
+            'do',
+            'not',
+            'defined',
+            'exist'
+        ),
+        2 => array(
+            "ASSOC",
+            "ATTRIB",
+            "BREAK",
+            "BCDEDIT",
+            "CACLS",
+            "CD",
+            "CHCP",
+            "CHDIR",
+            "CHKDSK",
+            "CHKNTFS",
+            "CLS",
+            "CMD",
+            "COLOR",
+            "COMP",
+            "COMPACT",
+            "CONVERT",
+            "COPY",
+            "DATE",
+            "DEL",
+            "DIR",
+            "DISKCOMP",
+            "DISKCOPY",
+            "DISKPART",
+            "DOSKEY",
+            "DRIVERQUERY",
+            "ECHO",
+            "ENDLOCAL",
+            "ERASE",
+            "EXIT",
+            "FC",
+            "FIND",
+            "FINDSTR",
+            "FOR",
+            "FORMAT",
+            "FSUTIL",
+            "FTYPE",
+            "GPRESULT",
+            "GRAFTABL",
+            "HELP",
+            "ICACLS",
+            "IF",
+            "LABEL",
+            "MD",
+            "MKDIR",
+            "MKLINK",
+            "MODE",
+            "MORE",
+            "MOVE",
+            "OPENFILES",
+            "PATH",
+            "PAUSE",
+            "POPD",
+            "PRINT",
+            "PROMPT",
+            "PUSHD",
+            "RD",
+            "RECOVER",
+            "REN",
+            "RENAME",
+            "REPLACE",
+            "RMDIR",
+            "ROBOCOPY",
+            "SET",
+            "SETLOCAL",
+            "SC",
+            "SCHTASKS",
+            "SHIFT",
+            "SHUTDOWN",
+            "SORT",
+            "START",
+            "SUBST",
+            "SYSTEMINFO",
+            "TASKLIST",
+            "TASKKILL",
+            "TIME",
+            "TITLE",
+            "TREE",
+            "TYPE",
+            "VER",
+            "VERIFY",
+            "VOL",
+            "XCOPY",
+            "WMIC",
+            "CSCRIPT"
+        ),
+        3 => array(
+            "enabledelayedexpansion",
+            "enableextensions"
+        )
+    ),
+    'SYMBOLS' => array(
+        '(',
+        ')',
+        '+',
+        '-',
+        '~',
+        '^',
+        '@',
+        '&',
+        '*',
+        '|',
+        '/',
+        '<',
+        '>'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800080; font-weight: bold;',
+            2 => 'color: #0080FF; font-weight: bold;',
+            3 => 'color: #0000FF; font-weight: bold;'
+        ),
+        'COMMENTS' => array(
+            101 => 'color: #44aa44; font-weight: bold;',
+            100 => 'color: #888888;',
+            102 => 'color: #990000; font-weight: bold;',
+            103 => 'color: #000099; font-weight: bold;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+        ),
+        'ESCAPE_CHAR' => array(
+            100 => 'color: #000099; font-weight: bold;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66; font-weight: bold;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+        ),
+        'METHODS' => array(
+            0 => 'color: #006600;'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #44aa44; font-weight: bold;'
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #990000; font-weight: bold',
+            1 => 'color: #800080; font-weight: bold;'
+        ),
+        'SCRIPT' => array()
+    ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "((?:goto|call)\\s*)(\\S+)",
+            GESHI_REPLACE => "\\2",
+            GESHI_BEFORE => "\\1",
+            GESHI_MODIFIERS => "si",
+            GESHI_AFTER => ""
+        ),
+        1 => "goto|call"
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/htdocs/application/libraries/geshi/geshi/bf.php b/htdocs/application/libraries/geshi/geshi/bf.php
index 023c059..06fddfe 100644
--- a/htdocs/application/libraries/geshi/geshi/bf.php
+++ b/htdocs/application/libraries/geshi/geshi/bf.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/10/31
  *
  * Brainfuck language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/biblatex.php b/htdocs/application/libraries/geshi/geshi/biblatex.php
new file mode 100644
index 0000000..8500cb6
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/biblatex.php
@@ -0,0 +1,200 @@
+<?php
+/********************************************************************************
+ * bibtex.php
+ * -----
+ * Author: Maïeul Rouquette from
+ * Quinn Taylor (quinntaylor@mac.com)
+ * Copyright: (c) 2009 Quinn Taylor (quinntaylor@mac.com), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.9.0
+ * Date Started: 2009/04/29
+ *
+ * BibLaTeX language file for GeSHi.
+ *
+ * CHANGES
+ * 2015/12/29 (1.0.8.13) Biblatex parser
+ * CHANGES
+ * -------
+ * 2009/04/29 (1.0.8.4)
+ *  -  First Release
+ *
+ * TODO
+ * -------------------------
+ *  - Add regex for matching and replacing URLs with corresponding hyperlinks
+ *  - Add regex for matching more LaTeX commands that may be embedded in BibTeX
+ *    (Someone who understands regex better than I should borrow from latex.php)
+ ********************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *
+*******************************************************************************/
+
+// http://en.wikipedia.org/wiki/BibTeX
+// http://www.fb10.uni-bremen.de/anglistik/langpro/bibliographies/jacobsen-bibtex.html
+
+$language_data = array (
+    'LANG_NAME' => 'BibTeX',
+    'OOLANG' => false,
+    'COMMENT_SINGLE' => array(
+        1 => '%%'
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        0 => array(
+            '@comment','@preamble','@string'
+            ),
+        // Standard entry types
+        1 => array(
+            '@article','@book','@booklet','@conference','@inbook',
+            '@incollection','@inproceedings','@manual','@mastersthesis',
+            '@misc','@phdthesis','@proceedings','@techreport','@unpublished'
+            ),
+        // Custom entry types
+        2 => array(
+            '@collection','@patent','@webpage'
+            ),
+        // Standard entry field names
+        3 => array(
+            'address','annote','author','booktitle','chapter','crossref',
+            'edition','editor','howpublished','institution','journal','key',
+            'month','note','number','organization','pages','publisher','school',
+            'series','title','type','volume','year',
+            ),
+        // Custom entry field names
+        4 => array(
+            'abstract','affiliation','chaptername','cited-by','cites',
+            'contents','copyright','date-added','date-modified','doi','eprint',
+            'isbn','issn','keywords','language','lccn','lib-congress',
+            'location','price','rating','read','size','source','url',
+            )
+        ),
+    'URLS' => array(
+        0 => '',
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'SYMBOLS' => array(
+        '{', '}', '#', '=', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        GESHI_COMMENTS => false,
+        ),
+    // Define the colors for the groups listed above
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #C02020;', // Standard entry types
+            2 => 'color: #C02020;', // Custom entry types
+            3 => 'color: #C08020;', // Standard entry field names
+            4 => 'color: #C08020;'  // Custom entry field names
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #2C922C; font-style: italic;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #2020C0;'
+            ),
+        'SYMBOLS' => array(
+            0 =>  'color: #E02020;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #2020C0;', // {...}
+            2 => 'color: #C08020;',  // BibDesk fields
+            3 => 'color: #800000;',   // LaTeX commands
+            4 => 'color: #C08020;', // Custom entry field (biblatex)
+            5 => 'color: #C02020;', // Custom entry types (biblatex)
+            ),
+        'ESCAPE_CHAR' => array(
+            0 =>  'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 =>  'color: #E02020;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'REGEXPS' => array(
+        // {parameters}
+        1 => array(
+            GESHI_SEARCH => "(?<=\\{)(?:\\{(?R)\\}|[^\\{\\}])*(?=\\})",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => "\bBdsk-(File|Url)-\d+",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => "\\\\[A-Za-z0-9]*+",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => "([A-z]+)\s+=",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        5 => array(
+            GESHI_SEARCH => "@([A-z])+",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)'
+                ),
+            4 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)'
+                ),
+            )
+        )
+    );
diff --git a/htdocs/application/libraries/geshi/geshi/bibtex.php b/htdocs/application/libraries/geshi/geshi/bibtex.php
index 5afecbf..169011e 100644
--- a/htdocs/application/libraries/geshi/geshi/bibtex.php
+++ b/htdocs/application/libraries/geshi/geshi/bibtex.php
@@ -4,7 +4,7 @@
  * -----
  * Author: Quinn Taylor (quinntaylor@mac.com)
  * Copyright: (c) 2009 Quinn Taylor (quinntaylor@mac.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/04/29
  *
  * BibTeX language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/blitzbasic.php b/htdocs/application/libraries/geshi/geshi/blitzbasic.php
index 8ea6063..6311e8a 100644
--- a/htdocs/application/libraries/geshi/geshi/blitzbasic.php
+++ b/htdocs/application/libraries/geshi/geshi/blitzbasic.php
@@ -4,7 +4,7 @@
  * --------------
  * Author: P�draig O`Connel (info@moonsword.info)
  * Copyright: (c) 2005 P�draig O`Connel (http://moonsword.info)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 16.10.2005
  *
  * BlitzBasic language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/bnf.php b/htdocs/application/libraries/geshi/geshi/bnf.php
index 0fe98d1..fafd94f 100644
--- a/htdocs/application/libraries/geshi/geshi/bnf.php
+++ b/htdocs/application/libraries/geshi/geshi/bnf.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Rowan Rodrik van der Molen (rowan@bigsmoke.us)
  * Copyright: (c) 2006 Rowan Rodrik van der Molen (http://www.bigsmoke.us/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/09/28
  *
  * BNF (Backus-Naur form) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/boo.php b/htdocs/application/libraries/geshi/geshi/boo.php
index 862881a..19c8378 100644
--- a/htdocs/application/libraries/geshi/geshi/boo.php
+++ b/htdocs/application/libraries/geshi/geshi/boo.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
  * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/09/10
  *
  * Boo language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/c.php b/htdocs/application/libraries/geshi/geshi/c.php
index 9dbe610..75e1c27 100644
--- a/htdocs/application/libraries/geshi/geshi/c.php
+++ b/htdocs/application/libraries/geshi/geshi/c.php
@@ -7,7 +7,7 @@
  *  - Jack Lloyd (lloyd@randombit.net)
  *  - Michael Mol (mikemol@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * C language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/c_loadrunner.php b/htdocs/application/libraries/geshi/geshi/c_loadrunner.php
index 12c60df..c1559bc 100644
--- a/htdocs/application/libraries/geshi/geshi/c_loadrunner.php
+++ b/htdocs/application/libraries/geshi/geshi/c_loadrunner.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Stuart Moncrieff (stuart at myloadtest dot com)
  * Copyright: (c) 2010 Stuart Moncrieff (http://www.myloadtest.com/loadrunner-syntax-highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010-07-25
  *
  * C (for LoadRunner) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/c_mac.php b/htdocs/application/libraries/geshi/geshi/c_mac.php
index 94131a5..dc03184 100644
--- a/htdocs/application/libraries/geshi/geshi/c_mac.php
+++ b/htdocs/application/libraries/geshi/geshi/c_mac.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
  * Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * C for Macs language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/c_winapi.php b/htdocs/application/libraries/geshi/geshi/c_winapi.php
index 69cad2a..37db047 100644
--- a/htdocs/application/libraries/geshi/geshi/c_winapi.php
+++ b/htdocs/application/libraries/geshi/geshi/c_winapi.php
@@ -7,7 +7,7 @@
  *  - Jack Lloyd (lloyd@randombit.net)
  *  - Michael Mol (mikemol@gmail.com)
  * Copyright: (c) 2012 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/08/12
  *
  * C (WinAPI) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/caddcl.php b/htdocs/application/libraries/geshi/geshi/caddcl.php
index 8408f29..6a205f9 100644
--- a/htdocs/application/libraries/geshi/geshi/caddcl.php
+++ b/htdocs/application/libraries/geshi/geshi/caddcl.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/30
  *
  * CAD DCL (Dialog Control Language) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/cadlisp.php b/htdocs/application/libraries/geshi/geshi/cadlisp.php
index 6a91375..97ac8ed 100644
--- a/htdocs/application/libraries/geshi/geshi/cadlisp.php
+++ b/htdocs/application/libraries/geshi/geshi/cadlisp.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/blog)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/30
  *
  * AutoCAD/IntelliCAD Lisp language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ceylon.php b/htdocs/application/libraries/geshi/geshi/ceylon.php
new file mode 100644
index 0000000..1c806d3
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/ceylon.php
@@ -0,0 +1,171 @@
+<?php
+/*************************************************************************************
+ * ceylon.php
+ * ----------
+ * Author: Lucas Werkmeister (mail@lucaswerkmeister.de)
+ * Copyright: (c) 2015 Lucas Werkmeister (http://lucaswerkmeister.de)
+ * Release Version: 1.0.9.0
+ * Date Started: 2015-01-08
+ *
+ * Ceylon language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * TODO (updated 2015-06-19)
+ * ------------------
+ * * Regexes match and break help URLs, so those are commented out for now
+ * * Ceylon supports nested block comments
+ * * The Ceylon compiler correctly parses
+ *       "\{FICTITIOUS CHARACTER WITH " IN NAME}"
+ *   as a single string literal.
+ *   (However, that's not really important
+ *   since Unicode character names never contain quotes.)
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Ceylon',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#!'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        /*
+         * 1. regular line comments (see COMMENT_SINGLE)
+         * 2. shebang line comments (see COMMENT_SINGLE)
+         * 3. strings (including string templates)
+         */
+        3 => '/(?:"|``).*?(?:``|")/'
+    ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*
+         * 1. lexer keywords (class, else, etc.)
+         * 2. language modifiers (shared, formal, etc.)
+         * 3. language doc modifiers (doc, see, etc.)
+         */
+        1 => array(
+            'assembly', 'module', 'package', 'import',
+            'alias', 'class', 'interface', 'object', 'given',
+            'value', 'assign', 'void', 'function',
+            'new', 'of', 'extends', 'satisfies', 'abstracts',
+            'in', 'out',
+            'return', 'break', 'continue', 'throw', 'assert',
+            'dynamic',
+            'if', 'else', 'switch', 'case',
+            'for', 'while', 'try', 'catch', 'finally',
+            'then', 'let',
+            'this', 'outer', 'super',
+            'is', 'exists', 'nonempty'
+        ),
+        2 => array(
+            'shared', 'abstract', 'formal', 'default', 'actual',
+            'variable', 'late', 'native', 'deprecated',
+            'final', 'sealed', 'annotation', 'small'
+        ),
+        3 => array(
+            'doc', 'by', 'license', 'see', 'throws', 'tagged'
+        )
+    ),
+    'SYMBOLS' => array(
+        ',', ';', '...', '{', '}', '[', ']', '`', '?.', '*.',
+        '?', '-&gt;', '=&gt;',
+        '**', '++', '--', '..', ':', '&&', '||',
+        '+=', '-=', '*=', '/=', '%=', '|=', '&=', '~=', '||=', '&&=',
+        '+', '-', '*', '/', '%', '^',
+        '~', '&', '|', '===', '==', '=', '!=', '!',
+        '&lt;=&gt;', '&lt;=', '&gt;=',
+        '&lt;', '&gt;',
+        '.'
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight:bold;color:#4C4C4C;',
+            2 => 'color:#39C',
+            3 => 'color:#39C'
+        ),
+        'COMMENTS' => array(
+            1 => 'color:darkgray;',
+            2 => 'color:darkgray;',
+            3 => 'color:blue',
+            'MULTI' => 'color:darkgray;'
+        ),
+        'STRINGS' => array(
+            0 => 'color:blue;'
+        ),
+        'REGEXPS' => array(
+            1 => 'color:#639;',
+            2 => 'color:#039;',
+            3 => 'color:#906;'
+        ),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'SYMBOLS' => array(),
+        'SCRIPT' => array()
+    ),
+    'REGEXPS' => array(
+        /*
+         * 1. qualified lidentifiers
+         * 2. lidentifiers
+         * 3. uidentifiers
+         *
+         * All of these contain various lookahead and -behind to ensure
+         * that we don't match various stuff that GeSHi escapes
+         * (for instance, we see semicolons as <SEMI>).
+         */
+        1 => array(
+            GESHI_SEARCH => '\\b((\?|\*)?\.[[:space:]]*)([[:lower:]][[:alnum:]]*|\\\\i[[:alnum:]]*)\\b',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+        ),
+        2 => array(
+            GESHI_SEARCH => '(?<![|<>&![:alnum:]])([[:lower:]][[:alnum:]]*|\\\\i[[:alnum:]]*)(?![>[:alnum:]])',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+        ),
+        3 => array(
+            GESHI_SEARCH => '(?<![|<>&![:alnum:]])([[:upper:]][[:alnum:]]*|\\\\I[[:alnum:]]*)(?![>[:alnum:]])',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+        )
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'URLS' => array(
+        1 => '',
+        2 => '', 3 => '' // the real URLs are commented out because syntax highlighting breaks them
+//      2 => 'https://modules.ceylon-lang.org/repo/1/ceylon/language/1.1.0/module-doc/api/index.html#{FNAME}',
+//      3 => 'https://modules.ceylon-lang.org/repo/1/ceylon/language/1.1.0/module-doc/api/index.html#{FNAME}',
+    ),
+    'CASE_SENSITIVE' => array(1 => true, 2 => true, 3 => true),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/htdocs/application/libraries/geshi/geshi/cfdg.php b/htdocs/application/libraries/geshi/geshi/cfdg.php
index 788e056..7ad658d 100644
--- a/htdocs/application/libraries/geshi/geshi/cfdg.php
+++ b/htdocs/application/libraries/geshi/geshi/cfdg.php
@@ -4,7 +4,7 @@
  * --------
  * Author: John Horigan <john@glyphic.com>
  * Copyright: (c) 2006 John Horigan http://www.ozonehouse.com/john/
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/03/11
  *
  * CFDG language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/cfm.php b/htdocs/application/libraries/geshi/geshi/cfm.php
index c045466..7f98c33 100644
--- a/htdocs/application/libraries/geshi/geshi/cfm.php
+++ b/htdocs/application/libraries/geshi/geshi/cfm.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Diego
  * Copyright: (c) 2006 Diego
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/02/25
  *
  * ColdFusion language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/chaiscript.php b/htdocs/application/libraries/geshi/geshi/chaiscript.php
index 677f2af..13570c9 100644
--- a/htdocs/application/libraries/geshi/geshi/chaiscript.php
+++ b/htdocs/application/libraries/geshi/geshi/chaiscript.php
@@ -6,7 +6,7 @@
  * Copyright: (c) 2010 Jason Turner (lefticus@gmail.com),
  *            (c) 2009 Jonathan Turner,
  *            (c) 2004 Ben Keen (ben.keen@gmail.com), Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/07/03
  *
  * ChaiScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/chapel.php b/htdocs/application/libraries/geshi/geshi/chapel.php
index d0e50e6..d043634 100644
--- a/htdocs/application/libraries/geshi/geshi/chapel.php
+++ b/htdocs/application/libraries/geshi/geshi/chapel.php
@@ -4,14 +4,14 @@
  * -----
  * Author: Richard Molitor (richard.molitor@student.kit.edu)
  * Copyright: (c) 2013 Richard Molitor
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2013/06/22
  *
  * Chapel language file for GeSHi.
  *
  * CHANGES
  * -------
- * 2013/06/22 (1.0.8.12)
+ * 2013/06/22 (1.0.8.13)
  *   -  First Release
  *
  * TODO (updated 2013/06/22)
diff --git a/htdocs/application/libraries/geshi/geshi/cil.php b/htdocs/application/libraries/geshi/geshi/cil.php
index c1fe8a9..82a2052 100644
--- a/htdocs/application/libraries/geshi/geshi/cil.php
+++ b/htdocs/application/libraries/geshi/geshi/cil.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
  * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/10/24
  *
  * CIL (Common Intermediate Language) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/clojure.php b/htdocs/application/libraries/geshi/geshi/clojure.php
index 0b9ed44..0a5d1dd 100644
--- a/htdocs/application/libraries/geshi/geshi/clojure.php
+++ b/htdocs/application/libraries/geshi/geshi/clojure.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Jess Johnson (jess@grok-code.com)
  * Copyright: (c) 2009 Jess Johnson (http://grok-code.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/09/20
  *
  * Clojure language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/cmake.php b/htdocs/application/libraries/geshi/geshi/cmake.php
index 2155216..cebf147 100644
--- a/htdocs/application/libraries/geshi/geshi/cmake.php
+++ b/htdocs/application/libraries/geshi/geshi/cmake.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Daniel Nelson (danieln@eng.utah.edu)
  * Copyright: (c) 2009 Daniel Nelson
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/04/06
  *
  * CMake language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/cobol.php b/htdocs/application/libraries/geshi/geshi/cobol.php
index 1280a4c..990551a 100644
--- a/htdocs/application/libraries/geshi/geshi/cobol.php
+++ b/htdocs/application/libraries/geshi/geshi/cobol.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: BenBE (BenBE@omorphia.org)
  * Copyright: (c) 2007-2008 BenBE (http://www.omorphia.de/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/07/02
  *
  * COBOL language file for GeSHi.
@@ -16,13 +16,13 @@
  *
  * CHANGES
  * -------
- * 2013/11/17 (1.0.8.12)
+ * 2013/11/17 (1.0.8.13)
  *  -  Changed compiler directives to be handled like comments.
  *  -  Fixed bug where keywords in identifiers were highlighted.
- * 2013/08/19 (1.0.8.12)
+ * 2013/08/19 (1.0.8.13)
  *  -  Added more intrinsic functions, reserved words, and compiler directives
  *     from the (upcoming) standard.
- * 2013/07/07 (1.0.8.12)
+ * 2013/07/07 (1.0.8.13)
  *  -  Added more reserved words, compiler directives and intrinsic functions.
  *  -  Added modern comment syntax and corrected the other one.
  *  -  Set OOLANG to true and added an object splitter.
diff --git a/htdocs/application/libraries/geshi/geshi/coffeescript.php b/htdocs/application/libraries/geshi/geshi/coffeescript.php
index 7a69e21..9656668 100644
--- a/htdocs/application/libraries/geshi/geshi/coffeescript.php
+++ b/htdocs/application/libraries/geshi/geshi/coffeescript.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Trevor Burnham (trevorburnham@gmail.com)
  * Copyright: (c) 2010 Trevor Burnham (http://iterative.ly)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/06/08
  *
  * CoffeeScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/cpp-qt.php b/htdocs/application/libraries/geshi/geshi/cpp-qt.php
index fbd5c84..40b7e5a 100644
--- a/htdocs/application/libraries/geshi/geshi/cpp-qt.php
+++ b/htdocs/application/libraries/geshi/geshi/cpp-qt.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Iulian M
  * Copyright: (c) 2006 Iulian M
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/09/27
  *
  * C++ (with Qt extensions) language file for GeSHi.
@@ -95,7 +95,8 @@ $language_data = array (
             'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
             'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class' ,
             'foreach','connect', 'Q_OBJECT' , 'slots' , 'signals', 'Q_SIGNALS', 'Q_SLOTS',
-            'Q_FOREACH', 'QCOMPARE', 'QVERIFY', 'qDebug', 'kDebug', 'QBENCHMARK'
+            'Q_FOREACH', 'QCOMPARE', 'QVERIFY', 'qDebug', 'kDebug', 'QBENCHMARK',
+            'SIGNAL', 'SLOT', 'emit'
             ),
         3 => array(
             'cin', 'cerr', 'clog', 'cout',
@@ -141,334 +142,387 @@ $language_data = array (
             'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t'
             ),
         5 => array(
-            "Q_UINT16", "Q_UINT32", "Q_UINT64", "Q_UINT8", "Q_ULLONG",
-            "Q_ULONG", "Q3Accel", "Q3Action", "Q3ActionGroup", "Q3AsciiBucket",
-            "Q3AsciiCache", "Q3AsciiCacheIterator", "Q3AsciiDict",
-            "Q3AsciiDictIterator", "Q3BaseBucket", "Q3BoxLayout", "Q3Button",
-            "Q3ButtonGroup", "Q3Cache", "Q3CacheIterator", "Q3Canvas",
-            "Q3CanvasEllipse", "Q3CanvasItem", "Q3CanvasItemList",
-            "Q3CanvasLine", "Q3CanvasPixmap", "Q3CanvasPixmapArray",
-            "Q3CanvasPolygon", "Q3CanvasPolygonalItem", "Q3CanvasRectangle",
-            "Q3CanvasSpline", "Q3CanvasSprite", "Q3CanvasText", "Q3CanvasView",
-            "Q3CheckListItem", "Q3CheckTableItem", "Q3CleanupHandler",
-            "Q3ColorDrag", "Q3ComboBox", "Q3ComboTableItem", "Q3CString",
-            "Q3DataBrowser", "Q3DataTable", "Q3DataView", "Q3DateEdit",
-            "Q3DateTimeEdit", "Q3DateTimeEditBase", "Q3DeepCopy", "Q3Dict",
-            "Q3DictIterator", "Q3Dns", "Q3DnsSocket", "Q3DockArea",
-            "Q3DockAreaLayout", "Q3DockWindow", "Q3DragObject", "Q3DropSite",
-            "Q3EditorFactory", "Q3FileDialog", "Q3FileIconProvider",
-            "Q3FilePreview", "Q3Frame", "Q3Ftp", "Q3GArray", "Q3GCache",
-            "Q3GCacheIterator", "Q3GDict", "Q3GDictIterator", "Q3GList",
-            "Q3GListIterator", "Q3GListStdIterator", "Q3Grid", "Q3GridLayout",
-            "Q3GridView", "Q3GroupBox", "Q3GVector", "Q3HBox", "Q3HBoxLayout",
-            "Q3HButtonGroup", "Q3Header", "Q3HGroupBox", "Q3Http",
-            "Q3HttpHeader", "Q3HttpRequestHeader", "Q3HttpResponseHeader",
-            "Q3IconDrag", "Q3IconDragItem", "Q3IconView", "Q3IconViewItem",
-            "Q3ImageDrag", "Q3IntBucket", "Q3IntCache", "Q3IntCacheIterator",
-            "Q3IntDict", "Q3IntDictIterator", "Q3ListBox", "Q3ListBoxItem",
-            "Q3ListBoxPixmap", "Q3ListBoxText", "Q3ListView", "Q3ListViewItem",
-            "Q3ListViewItemIterator", "Q3LNode", "Q3LocalFs", "Q3MainWindow",
-            "Q3MemArray", "Q3MimeSourceFactory", "Q3MultiLineEdit",
-            "Q3NetworkOperation", "Q3NetworkProtocol", "Q3NetworkProtocolDict",
-            "Q3NetworkProtocolFactory", "Q3NetworkProtocolFactoryBase",
-            "Q3ObjectDictionary", "Q3PaintDeviceMetrics", "Q3Painter",
-            "Q3Picture", "Q3PointArray", "Q3PolygonScanner", "Q3PopupMenu",
-            "Q3Process", "Q3ProgressBar", "Q3ProgressDialog", "Q3PtrBucket",
-            "Q3PtrCollection", "Q3PtrDict", "Q3PtrDictIterator", "Q3PtrList",
-            "Q3PtrListIterator", "Q3PtrListStdIterator", "Q3PtrQueue",
-            "Q3PtrStack", "Q3PtrVector", "Q3RangeControl", "Q3ScrollView",
-            "Q3Semaphore", "Q3ServerSocket", "Q3Shared", "Q3Signal",
-            "Q3SimpleRichText", "Q3SingleCleanupHandler", "Q3Socket",
-            "Q3SocketDevice", "Q3SortedList", "Q3SpinWidget", "Q3SqlCursor",
-            "Q3SqlEditorFactory", "Q3SqlFieldInfo", "Q3SqlFieldInfoList",
-            "Q3SqlForm", "Q3SqlPropertyMap", "Q3SqlRecordInfo",
-            "Q3SqlSelectCursor", "Q3StoredDrag", "Q3StrIList", "Q3StringBucket",
-            "Q3StrIVec", "Q3StrList", "Q3StrListIterator", "Q3StrVec",
-            "Q3StyleSheet", "Q3StyleSheetItem", "Q3SyntaxHighlighter",
-            "Q3TabDialog", "Q3Table", "Q3TableItem", "Q3TableSelection",
-            "Q3TextBrowser", "Q3TextDrag", "Q3TextEdit",
-            "Q3TextEditOptimPrivate", "Q3TextStream", "Q3TextView",
-            "Q3TimeEdit", "Q3ToolBar", "Q3TSFUNC", "Q3UriDrag", "Q3Url",
-            "Q3UrlOperator", "Q3ValueList", "Q3ValueListConstIterator",
-            "Q3ValueListIterator", "Q3ValueStack", "Q3ValueVector", "Q3VBox",
-            "Q3VBoxLayout", "Q3VButtonGroup", "Q3VGroupBox", "Q3WhatsThis",
-            "Q3WidgetStack", "Q3Wizard", "QAbstractButton",
-            "QAbstractEventDispatcher", "QAbstractExtensionFactory",
-            "QAbstractExtensionManager", "QAbstractFileEngine",
-            "QAbstractFileEngineHandler", "QAbstractFileEngineIterator",
-            "QAbstractFormBuilder", "QAbstractGraphicsShapeItem",
-            "QAbstractItemDelegate", "QAbstractItemModel", "QAbstractItemView",
-            "QAbstractListModel", "QAbstractMessageHandler",
-            "QAbstractNetworkCache", "QAbstractPageSetupDialog",
-            "QAbstractPrintDialog", "QAbstractProxyModel",
-            "QAbstractScrollArea", "QAbstractSlider", "QAbstractSocket",
-            "QAbstractSpinBox", "QAbstractTableModel",
-            "QAbstractTextDocumentLayout", "QAbstractUndoItem",
-            "QAbstractUriResolver", "QAbstractXmlNodeModel",
-            "QAbstractXmlReceiver", "QAccessible", "QAccessible2Interface",
-            "QAccessibleApplication", "QAccessibleBridge",
-            "QAccessibleBridgeFactoryInterface", "QAccessibleBridgePlugin",
-            "QAccessibleEditableTextInterface", "QAccessibleEvent",
-            "QAccessibleFactoryInterface", "QAccessibleInterface",
-            "QAccessibleInterfaceEx", "QAccessibleObject",
-            "QAccessibleObjectEx", "QAccessiblePlugin",
-            "QAccessibleSimpleEditableTextInterface",
-            "QAccessibleTableInterface", "QAccessibleTextInterface",
-            "QAccessibleValueInterface", "QAccessibleWidget",
-            "QAccessibleWidgetEx", "QAction", "QActionEvent", "QActionGroup",
-            "QApplication", "QArgument", "QAssistantClient", "QAtomicInt",
-            "QAtomicPointer", "QAuthenticator", "QBasicAtomicInt",
-            "QBasicAtomicPointer", "QBasicTimer", "QBitArray", "QBitmap",
-            "QBitRef", "QBool", "QBoxLayout", "QBrush", "QBrushData", "QBuffer",
-            "QButtonGroup", "QByteArray", "QByteArrayMatcher", "QByteRef",
-            "QCache", "QCalendarWidget", "QCDEStyle", "QChar", "QCharRef",
-            "QCheckBox", "QChildEvent", "QCleanlooksStyle", "QClipboard",
-            "QClipboardEvent", "QCloseEvent", "QColor", "QColorDialog",
-            "QColorGroup", "QColormap", "QColumnView", "QComboBox",
-            "QCommandLinkButton", "QCommonStyle", "QCompleter",
-            "QConicalGradient", "QConstString", "QContextMenuEvent", "QCOORD",
-            "QCoreApplication", "QCryptographicHash", "QCursor", "QCursorShape",
-            "QCustomEvent", "QDataStream", "QDataWidgetMapper", "QDate",
-            "QDateEdit", "QDateTime", "QDateTimeEdit", "QDB2Driver",
-            "QDB2Result", "QDBusAbstractAdaptor", "QDBusAbstractInterface",
-            "QDBusArgument", "QDBusConnection", "QDBusConnectionInterface",
-            "QDBusContext", "QDBusError", "QDBusInterface", "QDBusMessage",
-            "QDBusMetaType", "QDBusObjectPath", "QDBusPendingCall",
-            "QDBusPendingCallWatcher", "QDBusPendingReply",
-            "QDBusPendingReplyData", "QDBusReply", "QDBusServer",
-            "QDBusSignature", "QDBusVariant", "QDebug",
-            "QDesignerActionEditorInterface", "QDesignerBrushManagerInterface",
-            "QDesignerComponents", "QDesignerContainerExtension",
-            "QDesignerCustomWidgetCollectionInterface",
-            "QDesignerCustomWidgetInterface", "QDesignerDnDItemInterface",
-            "QDesignerDynamicPropertySheetExtension", "QDesignerExportWidget",
-            "QDesignerExtraInfoExtension", "QDesignerFormEditorInterface",
-            "QDesignerFormEditorPluginInterface", "QDesignerFormWindowCursorInterface",
-            "QDesignerFormWindowInterface", "QDesignerFormWindowManagerInterface",
-            "QDesignerFormWindowToolInterface",
-            "QDesignerIconCacheInterface", "QDesignerIntegrationInterface",
-            "QDesignerLanguageExtension", "QDesignerLayoutDecorationExtension",
-            "QDesignerMemberSheetExtension", "QDesignerMetaDataBaseInterface",
-            "QDesignerMetaDataBaseItemInterface",
-            "QDesignerObjectInspectorInterface", "QDesignerPromotionInterface",
-            "QDesignerPropertyEditorInterface",
-            "QDesignerPropertySheetExtension", "QDesignerResourceBrowserInterface",
-            "QDesignerTaskMenuExtension", "QDesignerWidgetBoxInterface",
-            "QDesignerWidgetDataBaseInterface", "QDesignerWidgetDataBaseItemInterface",
-            "QDesignerWidgetFactoryInterface", "QDesktopServices",
-            "QDesktopWidget", "QDial", "QDialog", "QDialogButtonBox", "QDir",
-            "QDirIterator", "QDirModel", "QDockWidget", "QDomAttr",
-            "QDomCDATASection", "QDomCharacterData", "QDomComment",
-            "QDomDocument", "QDomDocumentFragment", "QDomDocumentType",
-            "QDomElement", "QDomEntity", "QDomEntityReference",
-            "QDomImplementation", "QDomNamedNodeMap", "QDomNode",
-            "QDomNodeList", "QDomNotation", "QDomProcessingInstruction",
-            "QDomText", "QDoubleSpinBox", "QDoubleValidator", "QDrag",
-            "QDragEnterEvent", "QDragLeaveEvent", "QDragMoveEvent",
-            "QDragResponseEvent", "QDropEvent", "QDynamicPropertyChangeEvent",
-            "QErrorMessage", "QEvent", "QEventLoop", "QEventSizeOfChecker",
-            "QExplicitlySharedDataPointer", "QExtensionFactory",
-            "QExtensionManager", "QFactoryInterface", "QFile", "QFileDialog",
-            "QFileIconProvider", "QFileInfo", "QFileInfoList",
-            "QFileInfoListIterator", "QFileOpenEvent", "QFileSystemModel",
-            "QFileSystemWatcher", "QFlag", "QFlags", "QFocusEvent",
-            "QFocusFrame", "QFont", "QFontComboBox", "QFontDatabase",
-            "QFontDialog", "QFontInfo", "QFontMetrics", "QFontMetricsF",
-            "QForeachContainer", "QForeachContainerBase", "QFormBuilder",
-            "QFormLayout", "QFrame", "QFSFileEngine", "QFtp", "QFuture",
-            "QFutureInterface", "QFutureInterfaceBase", "QFutureIterator",
-            "QFutureSynchronizer", "QFutureWatcher", "QFutureWatcherBase",
-            "QGenericArgument", "QGenericReturnArgument", "QGLColormap",
-            "QGLContext", "QGLFormat", "QGLFramebufferObject", "QGlobalStatic",
-            "QGlobalStaticDeleter", "QGLPixelBuffer", "QGLWidget", "QGradient",
-            "QGradientStop", "QGradientStops", "QGraphicsEllipseItem",
-            "QGraphicsGridLayout", "QGraphicsItem", "QGraphicsItemAnimation",
-            "QGraphicsItemGroup", "QGraphicsLayout", "QGraphicsLayoutItem",
-            "QGraphicsLinearLayout", "QGraphicsLineItem", "QGraphicsPathItem",
-            "QGraphicsPixmapItem", "QGraphicsPolygonItem",
-            "QGraphicsProxyWidget", "QGraphicsRectItem", "QGraphicsScene",
-            "QGraphicsSceneContextMenuEvent", "QGraphicsSceneDragDropEvent",
-            "QGraphicsSceneEvent", "QGraphicsSceneHelpEvent",
-            "QGraphicsSceneHoverEvent", "QGraphicsSceneMouseEvent",
-            "QGraphicsSceneMoveEvent", "QGraphicsSceneResizeEvent",
-            "QGraphicsSceneWheelEvent", "QGraphicsSimpleTextItem",
-            "QGraphicsSvgItem", "QGraphicsTextItem", "QGraphicsView",
-            "QGraphicsWidget", "QGridLayout", "QGroupBox", "QGtkStyle", "QHash",
-            "QHashData", "QHashDummyNode", "QHashDummyValue", "QHashIterator",
-            "QHashNode", "QHBoxLayout", "QHeaderView", "QHelpContentItem",
-            "QHelpContentModel", "QHelpContentWidget", "QHelpEngine",
-            "QHelpEngineCore", "QHelpEvent", "QHelpGlobal", "QHelpIndexModel",
-            "QHelpIndexWidget", "QHelpSearchEngine", "QHelpSearchQuery",
-            "QHelpSearchQueryWidget", "QHelpSearchResultWidget", "QHideEvent",
-            "QHostAddress", "QHostInfo", "QHoverEvent", "QHttp", "QHttpHeader",
-            "QHttpRequestHeader", "QHttpResponseHeader", "QIBaseDriver",
-            "QIBaseResult", "QIcon", "QIconDragEvent", "QIconEngine",
-            "QIconEngineFactoryInterface", "QIconEngineFactoryInterfaceV2",
-            "QIconEnginePlugin", "QIconEnginePluginV2", "QIconEngineV2",
-            "QIconSet", "QImage", "QImageIOHandler",
-            "QImageIOHandlerFactoryInterface", "QImageIOPlugin", "QImageReader",
-            "QImageTextKeyLang", "QImageWriter", "QIncompatibleFlag",
-            "QInputContext", "QInputContextFactory",
-            "QInputContextFactoryInterface", "QInputContextPlugin",
-            "QInputDialog", "QInputEvent", "QInputMethodEvent", "Q_INT16",
-            "Q_INT32", "Q_INT64", "Q_INT8", "QInternal", "QIntForSize",
-            "QIntForType", "QIntValidator", "QIODevice", "Q_IPV6ADDR",
-            "QIPv6Address", "QItemDelegate", "QItemEditorCreator",
-            "QItemEditorCreatorBase", "QItemEditorFactory", "QItemSelection",
-            "QItemSelectionModel", "QItemSelectionRange", "QKeyEvent",
-            "QKeySequence", "QLabel", "QLatin1Char", "QLatin1String", "QLayout",
-            "QLayoutItem", "QLayoutIterator", "QLCDNumber", "QLibrary",
-            "QLibraryInfo", "QLine", "QLinearGradient", "QLineEdit", "QLineF",
-            "QLinkedList", "QLinkedListData", "QLinkedListIterator",
-            "QLinkedListNode", "QList", "QListData", "QListIterator",
-            "QListView", "QListWidget", "QListWidgetItem", "Q_LLONG", "QLocale",
-            "QLocalServer", "QLocalSocket", "Q_LONG", "QMacCompatGLenum",
-            "QMacCompatGLint", "QMacCompatGLuint", "QMacGLCompatTypes",
-            "QMacMime", "QMacPasteboardMime", "QMainWindow", "QMap", "QMapData",
-            "QMapIterator", "QMapNode", "QMapPayloadNode", "QMatrix",
-            "QMdiArea", "QMdiSubWindow", "QMenu", "QMenuBar",
-            "QMenubarUpdatedEvent", "QMenuItem", "QMessageBox",
-            "QMetaClassInfo", "QMetaEnum", "QMetaMethod", "QMetaObject",
-            "QMetaObjectExtraData", "QMetaProperty", "QMetaType", "QMetaTypeId",
-            "QMetaTypeId2", "QMimeData", "QMimeSource", "QModelIndex",
-            "QModelIndexList", "QMotifStyle", "QMouseEvent", "QMoveEvent",
-            "QMovie", "QMultiHash", "QMultiMap", "QMutableFutureIterator",
-            "QMutableHashIterator", "QMutableLinkedListIterator",
-            "QMutableListIterator", "QMutableMapIterator",
-            "QMutableSetIterator", "QMutableStringListIterator",
-            "QMutableVectorIterator", "QMutex", "QMutexLocker", "QMYSQLDriver",
-            "QMYSQLResult", "QNetworkAccessManager", "QNetworkAddressEntry",
-            "QNetworkCacheMetaData", "QNetworkCookie", "QNetworkCookieJar",
-            "QNetworkDiskCache", "QNetworkInterface", "QNetworkProxy",
-            "QNetworkProxyFactory", "QNetworkProxyQuery", "QNetworkReply",
-            "QNetworkRequest", "QNoDebug", "QNoImplicitBoolCast", "QObject",
-            "QObjectCleanupHandler", "QObjectData", "QObjectList",
-            "QObjectUserData", "QOCIDriver", "QOCIResult", "QODBCDriver",
-            "QODBCResult", "QPageSetupDialog", "QPaintDevice", "QPaintEngine",
-            "QPaintEngineState", "QPainter", "QPainterPath",
-            "QPainterPathPrivate", "QPainterPathStroker", "QPaintEvent",
-            "QPair", "QPalette", "QPen", "QPersistentModelIndex", "QPicture",
-            "QPictureFormatInterface", "QPictureFormatPlugin", "QPictureIO",
-            "Q_PID", "QPixmap", "QPixmapCache", "QPlainTextDocumentLayout",
-            "QPlainTextEdit", "QPlastiqueStyle", "QPluginLoader", "QPoint",
-            "QPointer", "QPointF", "QPolygon", "QPolygonF", "QPrintDialog",
-            "QPrintEngine", "QPrinter", "QPrinterInfo", "QPrintPreviewDialog",
-            "QPrintPreviewWidget", "QProcess", "QProgressBar",
-            "QProgressDialog", "QProxyModel", "QPSQLDriver", "QPSQLResult",
-            "QPushButton", "QQueue", "QRadialGradient", "QRadioButton",
-            "QReadLocker", "QReadWriteLock", "QRect", "QRectF", "QRegExp",
-            "QRegExpValidator", "QRegion", "QResizeEvent", "QResource",
-            "QReturnArgument", "QRgb", "QRubberBand", "QRunnable",
-            "QScriptable", "QScriptClass", "QScriptClassPropertyIterator",
-            "QScriptContext", "QScriptContextInfo", "QScriptContextInfoList",
-            "QScriptEngine", "QScriptEngineAgent", "QScriptEngineDebugger",
-            "QScriptExtensionInterface", "QScriptExtensionPlugin",
-            "QScriptString", "QScriptSyntaxCheckResult", "QScriptValue",
-            "QScriptValueIterator", "QScriptValueList", "QScrollArea",
-            "QScrollBar", "QSemaphore", "QSessionManager", "QSet",
-            "QSetIterator", "QSettings", "QSharedData", "QSharedDataPointer",
-            "QSharedMemory", "QSharedPointer", "QShortcut", "QShortcutEvent",
-            "QShowEvent", "QSignalMapper", "QSignalSpy", "QSimpleXmlNodeModel",
-            "QSize", "QSizeF", "QSizeGrip", "QSizePolicy", "QSlider",
-            "QSocketNotifier", "QSortFilterProxyModel", "QSound",
-            "QSourceLocation", "QSpacerItem", "QSpinBox", "QSplashScreen",
-            "QSplitter", "QSplitterHandle", "QSpontaneKeyEvent", "QSqlDatabase",
-            "QSqlDriver", "QSqlDriverCreator", "QSqlDriverCreatorBase",
-            "QSqlDriverFactoryInterface", "QSqlDriverPlugin", "QSqlError",
-            "QSqlField", "QSqlIndex", "QSQLite2Driver", "QSQLite2Result",
-            "QSQLiteDriver", "QSQLiteResult", "QSqlQuery", "QSqlQueryModel",
-            "QSqlRecord", "QSqlRelation", "QSqlRelationalDelegate",
-            "QSqlRelationalTableModel", "QSqlResult", "QSqlTableModel", "QSsl",
-            "QSslCertificate", "QSslCipher", "QSslConfiguration", "QSslError",
-            "QSslKey", "QSslSocket", "QStack", "QStackedLayout",
-            "QStackedWidget", "QStandardItem", "QStandardItemEditorCreator",
-            "QStandardItemModel", "QStatusBar", "QStatusTipEvent",
-            "QStdWString", "QString", "QStringList", "QStringListIterator",
-            "QStringListModel", "QStringMatcher", "QStringRef", "QStyle",
-            "QStyledItemDelegate", "QStyleFactory", "QStyleFactoryInterface",
-            "QStyleHintReturn", "QStyleHintReturnMask",
-            "QStyleHintReturnVariant", "QStyleOption", "QStyleOptionButton",
-            "QStyleOptionComboBox", "QStyleOptionComplex",
-            "QStyleOptionDockWidget", "QStyleOptionDockWidgetV2",
-            "QStyleOptionFocusRect", "QStyleOptionFrame", "QStyleOptionFrameV2",
-            "QStyleOptionFrameV3", "QStyleOptionGraphicsItem",
-            "QStyleOptionGroupBox", "QStyleOptionHeader",
-            "QStyleOptionMenuItem", "QStyleOptionProgressBar",
-            "QStyleOptionProgressBarV2", "QStyleOptionQ3DockWindow",
-            "QStyleOptionQ3ListView", "QStyleOptionQ3ListViewItem",
-            "QStyleOptionRubberBand", "QStyleOptionSizeGrip",
-            "QStyleOptionSlider", "QStyleOptionSpinBox", "QStyleOptionTab",
-            "QStyleOptionTabBarBase", "QStyleOptionTabBarBaseV2",
-            "QStyleOptionTabV2", "QStyleOptionTabV3",
-            "QStyleOptionTabWidgetFrame", "QStyleOptionTitleBar",
-            "QStyleOptionToolBar", "QStyleOptionToolBox",
-            "QStyleOptionToolBoxV2", "QStyleOptionToolButton",
-            "QStyleOptionViewItem", "QStyleOptionViewItemV2",
-            "QStyleOptionViewItemV3", "QStyleOptionViewItemV4", "QStylePainter",
-            "QStylePlugin", "QSvgGenerator", "QSvgRenderer", "QSvgWidget",
-            "QSyntaxHighlighter", "QSysInfo", "QSystemLocale",
-            "QSystemSemaphore", "QSystemTrayIcon", "Qt", "Qt3Support",
-            "QTabBar", "QTabletEvent", "QTableView", "QTableWidget",
-            "QTableWidgetItem", "QTableWidgetSelectionRange", "QTabWidget",
-            "QtAlgorithms", "QtAssistant", "QtCleanUpFunction",
-            "QtConcurrentFilter", "QtConcurrentMap", "QtConcurrentRun",
-            "QtContainerFwd", "QtCore", "QTcpServer", "QTcpSocket", "QtDBus",
-            "QtDebug", "QtDesigner", "QTDSDriver", "QTDSResult",
-            "QTemporaryFile", "QtEndian", "QTest", "QTestAccessibility",
-            "QTestAccessibilityEvent", "QTestData", "QTestDelayEvent",
-            "QTestEvent", "QTestEventList", "QTestEventLoop",
-            "QTestKeyClicksEvent", "QTestKeyEvent", "QTestMouseEvent",
-            "QtEvents", "QTextBlock", "QTextBlockFormat", "QTextBlockGroup",
-            "QTextBlockUserData", "QTextBoundaryFinder", "QTextBrowser",
-            "QTextCharFormat", "QTextCodec", "QTextCodecFactoryInterface",
-            "QTextCodecPlugin", "QTextCursor", "QTextDecoder", "QTextDocument",
-            "QTextDocumentFragment", "QTextDocumentWriter", "QTextEdit",
-            "QTextEncoder", "QTextFormat", "QTextFragment", "QTextFrame",
-            "QTextFrameFormat", "QTextFrameLayoutData", "QTextImageFormat",
-            "QTextInlineObject", "QTextIStream", "QTextItem", "QTextLayout",
-            "QTextLength", "QTextLine", "QTextList", "QTextListFormat",
-            "QTextObject", "QTextObjectInterface", "QTextOption",
-            "QTextOStream", "QTextStream", "QTextStreamFunction",
-            "QTextStreamManipulator", "QTextTable", "QTextTableCell",
-            "QTextTableCellFormat", "QTextTableFormat", "QtGlobal", "QtGui",
-            "QtHelp", "QThread", "QThreadPool", "QThreadStorage",
-            "QThreadStorageData", "QTime", "QTimeEdit", "QTimeLine", "QTimer",
-            "QTimerEvent", "QtMsgHandler", "QtNetwork", "QToolBar",
-            "QToolBarChangeEvent", "QToolBox", "QToolButton", "QToolTip",
-            "QtOpenGL", "QtPlugin", "QtPluginInstanceFunction", "QTransform",
-            "QTranslator", "QTreeView", "QTreeWidget", "QTreeWidgetItem",
-            "QTreeWidgetItemIterator", "QTS", "QtScript", "QtScriptTools",
-            "QtSql", "QtSvg", "QtTest", "QtUiTools", "QtWebKit", "QtXml",
-            "QtXmlPatterns", "QTypeInfo", "QUdpSocket", "QUiLoader",
-            "QUintForSize", "QUintForType", "QUndoCommand", "QUndoGroup",
-            "QUndoStack", "QUndoView", "QUnixPrintWidget", "QUpdateLaterEvent",
-            "QUrl", "QUrlInfo", "QUuid", "QValidator", "QVariant",
-            "QVariantComparisonHelper", "QVariantHash", "QVariantList",
-            "QVariantMap", "QVarLengthArray", "QVBoxLayout", "QVector",
-            "QVectorData", "QVectorIterator", "QVectorTypedData",
-            "QWaitCondition", "QWeakPointer", "QWebDatabase", "QWebFrame",
-            "QWebHistory", "QWebHistoryInterface", "QWebHistoryItem",
-            "QWebHitTestResult", "QWebPage", "QWebPluginFactory",
-            "QWebSecurityOrigin", "QWebSettings", "QWebView", "QWhatsThis",
-            "QWhatsThisClickedEvent", "QWheelEvent", "QWidget", "QWidgetAction",
-            "QWidgetData", "QWidgetItem", "QWidgetItemV2", "QWidgetList",
-            "QWidgetMapper", "QWidgetSet", "QWindowsCEStyle", "QWindowsMime",
-            "QWindowsMobileStyle", "QWindowsStyle", "QWindowStateChangeEvent",
-            "QWindowsVistaStyle", "QWindowsXPStyle", "QWizard", "QWizardPage",
-            "QWMatrix", "QWorkspace", "QWriteLocker", "QX11EmbedContainer",
-            "QX11EmbedWidget", "QX11Info", "QXmlAttributes",
-            "QXmlContentHandler", "QXmlDeclHandler", "QXmlDefaultHandler",
-            "QXmlDTDHandler", "QXmlEntityResolver", "QXmlErrorHandler",
-            "QXmlFormatter", "QXmlInputSource", "QXmlItem",
-            "QXmlLexicalHandler", "QXmlLocator", "QXmlName", "QXmlNamePool",
-            "QXmlNamespaceSupport", "QXmlNodeModelIndex", "QXmlParseException",
-            "QXmlQuery", "QXmlReader", "QXmlResultItems", "QXmlSerializer",
-            "QXmlSimpleReader", "QXmlStreamAttribute", "QXmlStreamAttributes",
-            "QXmlStreamEntityDeclaration", "QXmlStreamEntityDeclarations",
-            "QXmlStreamEntityResolver", "QXmlStreamNamespaceDeclaration",
-            "QXmlStreamNamespaceDeclarations", "QXmlStreamNotationDeclaration",
-            "QXmlStreamNotationDeclarations", "QXmlStreamReader",
-            "QXmlStreamStringRef", "QXmlStreamWriter"
+            'Q_INT8', 'Q_INT16', 'Q_INT32', 'Q_INT64', 'Q_LLONG', 'Q_LONG',
+            'Q_UINT8', 'Q_UINT16', 'Q_UINT32', 'Q_UINT64', 'Q_ULLONG', 'Q_ULONG',
+
+            'QAbstractAnimation', 'QAbstractButton', 'QAbstractEventDispatcher',
+            'QAbstractExtensionFactory', 'QAbstractExtensionManager',
+            'QAbstractFormBuilder', 'QAbstractGraphicsShapeItem',
+            'QAbstractItemDelegate', 'QAbstractItemModel', 'QAbstractItemView',
+            'QAbstractListModel', 'QAbstractMessageHandler',
+            'QAbstractNativeEventFilter', 'QAbstractNetworkCache',
+            'QAbstractOpenGLFunctions', 'QAbstractPlanarVideoBuffer',
+            'QAbstractPrintDialog', 'QAbstractProxyModel', 'QAbstractScrollArea',
+            'QAbstractSlider', 'QAbstractSocket', 'QAbstractSpinBox',
+            'QAbstractState', 'QAbstractTableModel',
+            'QAbstractTextDocumentLayout', 'QAbstractTransition',
+            'QAbstractUriResolver', 'QAbstractVideoBuffer',
+            'QAbstractVideoSurface', 'QAbstractXmlNodeModel',
+            'QAbstractXmlReceiver', 'QAccelerometer', 'QAccelerometerFilter',
+            'QAccelerometerReading', 'QAccessible', 'QAccessibleActionInterface',
+            'QAccessibleEditableTextInterface', 'QAccessibleEvent',
+            'QAccessibleInterface', 'QAccessibleObject', 'QAccessiblePlugin',
+            'QAccessibleStateChangeEvent', 'QAccessibleTableCellInterface',
+            'QAccessibleTableInterface', 'QAccessibleTableModelChangeEvent',
+            'QAccessibleTextCursorEvent', 'QAccessibleTextInsertEvent',
+            'QAccessibleTextInterface', 'QAccessibleTextRemoveEvent',
+            'QAccessibleTextSelectionEvent', 'QAccessibleTextUpdateEvent',
+            'QAccessibleValueChangeEvent', 'QAccessibleValueInterface',
+            'QAccessibleWidget', 'QAction', 'QActionEvent', 'QActionGroup',
+            'QAltimeter', 'QAltimeterFilter', 'QAltimeterReading',
+            'QAmbientLightFilter','QAmbientLightReading', 'QAmbientLightSensor',
+            'QAmbientTemperatureFilter', 'QAmbientTemperatureReading',
+            'QAmbientTemperatureSensor', 'QAndroidActivityResultReceiver',
+            'QAndroidJniEnvironment', 'QAndroidJniObject', 'QAnimationGroup',
+            'QApplication', 'QAssociativeIterable', 'QAtomicInt',
+            'QAtomicInteger', 'QAtomicPointer', 'QAudioBuffer', 'QAudioDecoder',
+            'QAudioDecoderControl', 'QAudioDeviceInfo', 'QAudioEncoderSettings',
+            'QAudioEncoderSettingsControl', 'QAudioFormat', 'QAudioInput',
+            'QAudioInputSelectorControl', 'QAudioOutput',
+            'QAudioOutputSelectorControl', 'QAudioProbe', 'QAudioRecorder',
+            'QAuthenticator', 'QAxAggregated', 'QAxBase', 'QAxBindable',
+            'QAxFactory', 'QAxObject', 'QAxScript', 'QAxScriptEngine',
+            'QAxScriptManager', 'QAxSelect', 'QAxWidget', 'QBackingStore',
+            'QBasicTimer', 'QBitArray', 'QBitmap', 'QBluetoothAddress',
+            'QBluetoothDeviceDiscoveryAgent', 'QBluetoothDeviceInfo',
+            'QBluetoothHostInfo', 'QBluetoothLocalDevice', 'QBluetoothServer',
+            'QBluetoothServiceDiscoveryAgent', 'QBluetoothServiceInfo',
+            'QBluetoothSocket', 'QBluetoothTransferManager',
+            'QBluetoothTransferReply', 'QBluetoothTransferRequest',
+            'QBluetoothUuid', 'QBoxLayout', 'QBrush', 'QBuffer', 'QButtonGroup',
+            'QByteArray', 'QByteArrayList', 'QByteArrayMatcher', 'QCache',
+            'QCalendarWidget', 'QCamera', 'QCameraCaptureBufferFormatControl',
+            'QCameraCaptureDestinationControl', 'QCameraControl',
+            'QCameraExposure', 'QCameraExposureControl', 'QCameraFeedbackControl',
+            'QCameraFlashControl', 'QCameraFocus', 'QCameraFocusControl',
+            'QCameraFocusZone', 'QCameraImageCapture',
+            'QCameraImageCaptureControl', 'QCameraImageProcessing',
+            'QCameraImageProcessingControl', 'QCameraInfo', 'QCameraInfoControl',
+            'QCameraLocksControl', 'QCameraViewfinder',
+            'QCameraViewfinderSettingsControl', 'QCameraZoomControl', 'QChar',
+            'QCheckBox', 'QChildEvent', 'QClipboard', 'QCloseEvent',
+            'QCocoaNativeContext', 'QCollator', 'QCollatorSortKey', 'QColor',
+            'QColorDialog', 'QColormap', 'QColumnView', 'QComboBox',
+            'QCommandLineOption', 'QCommandLineParser', 'QCommandLinkButton',
+            'QCommonStyle', 'QCompass', 'QCompassFilter', 'QCompassReading',
+            'QCompleter', 'QConicalGradient', 'QContextMenuEvent',
+            'QContiguousCache', 'QCoreApplication', 'QCryptographicHash',
+            'QCursor', 'QDBusAbstractAdaptor', 'QDBusAbstractInterface',
+            'QDBusArgument', 'QDBusConnection', 'QDBusConnectionInterface',
+            'QDBusContext', 'QDBusError', 'QDBusInterface', 'QDBusMessage',
+            'QDBusObjectPath', 'QDBusPendingCall', 'QDBusPendingCallWatcher',
+            'QDBusPendingReply', 'QDBusReply', 'QDBusServer',
+            'QDBusServiceWatcher', 'QDBusSignature', 'QDBusUnixFileDescriptor',
+            'QDBusVariant', 'QDBusVirtualObject', 'QDataStream',
+            'QDataWidgetMapper', 'QDate', 'QDateEdit', 'QDateTime',
+            'QDateTimeEdit', 'QDebug', 'QDebugStateSaver',
+            'QDesignerActionEditorInterface', 'QDesignerContainerExtension',
+            'QDesignerCustomWidgetCollectionInterface',
+            'QDesignerCustomWidgetInterface',
+            'QDesignerDynamicPropertySheetExtension',
+            'QDesignerFormEditorInterface', 'QDesignerFormWindowCursorInterface',
+            'QDesignerFormWindowInterface', 'QDesignerFormWindowManagerInterface',
+            'QDesignerMemberSheetExtension', 'QDesignerObjectInspectorInterface',
+            'QDesignerPropertyEditorInterface', 'QDesignerPropertySheetExtension',
+            'QDesignerTaskMenuExtension', 'QDesignerWidgetBoxInterface',
+            'QDesktopServices', 'QDesktopWidget', 'QDial', 'QDialog',
+            'QDialogButtonBox', 'QDir', 'QDirIterator', 'QDirModel',
+            'QDistanceFilter', 'QDistanceReading', 'QDistanceSensor',
+            'QDnsDomainNameRecord', 'QDnsHostAddressRecord', 'QDnsLookup',
+            'QDnsMailExchangeRecord', 'QDnsServiceRecord', 'QDnsTextRecord',
+            'QDockWidget', 'QDomAttr', 'QDomCDATASection', 'QDomCharacterData',
+            'QDomComment', 'QDomDocument', 'QDomDocumentFragment',
+            'QDomDocumentType', 'QDomElement', 'QDomEntity', 'QDomEntityReference',
+            'QDomImplementation', 'QDomNamedNodeMap', 'QDomNode', 'QDomNodeList',
+            'QDomNotation', 'QDomProcessingInstruction', 'QDomText',
+            'QDoubleSpinBox', 'QDoubleValidator', 'QDrag', 'QDragEnterEvent',
+            'QDragLeaveEvent', 'QDragMoveEvent', 'QDropEvent',
+            'QDynamicPropertyChangeEvent', 'EnginioClient',
+            'EnginioClientConnection', 'EnginioIdentity', 'EnginioModel',
+            'EnginioOAuth2Authentication', 'EnginioReply', 'QEGLNativeContext',
+            'QEasingCurve', 'QEglFSFunctions', 'QElapsedTimer',
+            'QEnableSharedFromThis', 'QEnterEvent', 'QErrorMessage', 'QEvent',
+            'QEventLoop', 'QEventLoopLocker', 'QEventTransition', 'QException',
+            'QExplicitlySharedDataPointer', 'QExposeEvent', 'QExtensionFactory',
+            'QExtensionManager', 'QFile', 'QFileDevice', 'QFileDialog',
+            'QFileIconProvider', 'QFileInfo', 'QFileOpenEvent', 'QFileSelector',
+            'QFileSystemModel', 'QFileSystemWatcher', 'QFinalState', 'QFlag',
+            'QFlags', 'QFocusEvent', 'QFocusFrame', 'QFont', 'QFontComboBox',
+            'QFontDatabase', 'QFontDialog', 'QFontInfo', 'QFontMetrics',
+            'QFontMetricsF', 'QFormBuilder', 'QFormLayout', 'QFrame', 'QFuture',
+            'QFutureIterator', 'QFutureSynchronizer', 'QFutureWatcher',
+            'QGLBuffer', 'QGLColormap', 'QGLContext', 'QGLFormat',
+            'QGLFramebufferObject', 'QGLFramebufferObjectFormat', 'QGLFunctions',
+            'QGLPixelBuffer', 'QGLShader', 'QGLShaderProgram', 'QGLWidget',
+            'QGLXNativeContext', 'QGenericArgument', 'QGenericMatrix',
+            'QGenericPlugin', 'QGenericPluginFactory', 'QGenericReturnArgument',
+            'QGeoAddress', 'QGeoAreaMonitorInfo', 'QGeoAreaMonitorSource',
+            'QGeoCircle', 'QGeoCodeReply', 'QGeoCodingManager',
+            'QGeoCodingManagerEngine', 'QGeoCoordinate', 'QGeoLocation',
+            'QGeoManeuver', 'QGeoPositionInfo', 'QGeoPositionInfoSource',
+            'QGeoPositionInfoSourceFactory', 'QGeoRectangle', 'QGeoRoute',
+            'QGeoRouteReply', 'QGeoRouteRequest', 'QGeoRouteSegment',
+            'QGeoRoutingManager', 'QGeoRoutingManagerEngine',
+            'QGeoSatelliteInfo', 'QGeoSatelliteInfoSource',
+            'QGeoServiceProvider', 'QGeoServiceProviderFactory', 'QGeoShape',
+            'QGesture', 'QGestureEvent', 'QGestureRecognizer', 'QGlobalStatic',
+            'QGlyphRun', 'QGradient', 'QGraphicsAnchor', 'QGraphicsAnchorLayout',
+            'QGraphicsBlurEffect', 'QGraphicsColorizeEffect',
+            'QGraphicsDropShadowEffect', 'QGraphicsEffect',
+            'QGraphicsEllipseItem', 'QGraphicsGridLayout', 'QGraphicsItem',
+            'QGraphicsItemAnimation', 'QGraphicsItemGroup', 'QGraphicsLayout',
+            'QGraphicsLayoutItem', 'QGraphicsLineItem', 'QGraphicsLinearLayout',
+            'QGraphicsObject', 'QGraphicsOpacityEffect', 'QGraphicsPathItem',
+            'QGraphicsPixmapItem', 'QGraphicsPolygonItem',
+            'QGraphicsProxyWidget', 'QGraphicsRectItem', 'QGraphicsRotation',
+            'QGraphicsScale', 'QGraphicsScene', 'QGraphicsSceneContextMenuEvent',
+            'QGraphicsSceneDragDropEvent', 'QGraphicsSceneEvent',
+            'QGraphicsSceneHelpEvent', 'QGraphicsSceneHoverEvent',
+            'QGraphicsSceneMouseEvent', 'QGraphicsSceneMoveEvent',
+            'QGraphicsSceneResizeEvent', 'QGraphicsSceneWheelEvent',
+            'QGraphicsSimpleTextItem', 'QGraphicsSvgItem', 'QGraphicsTextItem',
+            'QGraphicsTransform', 'QGraphicsVideoItem', 'QGraphicsView',
+            'QGraphicsWebView', 'QGraphicsWidget', 'QGridLayout', 'QGroupBox',
+            'QGuiApplication', 'QGyroscope', 'QGyroscopeFilter',
+            'QGyroscopeReading', 'QHBoxLayout', 'QHash', 'QHashIterator',
+            'QHeaderView', 'QHelpContentItem', 'QHelpContentModel',
+            'QHelpContentWidget', 'QHelpEngine', 'QHelpEngineCore', 'QHelpEvent',
+            'QHelpIndexModel', 'QHelpIndexWidget', 'QHelpSearchEngine',
+            'QHelpSearchQuery', 'QHelpSearchQueryWidget',
+            'QHelpSearchResultWidget', 'QHideEvent', 'QHistoryState',
+            'QHolsterFilter', 'QHolsterReading', 'QHolsterSensor',
+            'QHostAddress', 'QHostInfo', 'QHoverEvent', 'QHttpMultiPart',
+            'QHttpPart', 'QIODevice', 'QIRProximityFilter', 'QIRProximityReading',
+            'QIRProximitySensor', 'QIcon', 'QIconDragEvent', 'QIconEngine',
+            'QIconEnginePlugin', 'QIdentityProxyModel', 'QImage',
+            'QImageEncoderControl', 'QImageEncoderSettings', 'QImageIOHandler',
+            'QImageIOPlugin', 'QImageReader', 'QImageWriter', 'QInputDialog',
+            'QInputEvent', 'QInputMethod', 'QInputMethodEvent',
+            'QInputMethodQueryEvent', 'QIntValidator', 'QItemDelegate',
+            'QItemEditorCreator', 'QItemEditorCreatorBase', 'QItemEditorFactory',
+            'QItemSelection', 'QItemSelectionModel', 'QItemSelectionRange',
+            'QJSEngine', 'QJSValue', 'QJSValueIterator', 'QJsonArray',
+            'QJsonDocument', 'QJsonObject', 'QJsonParseError', 'QJsonValue',
+            'QKeyEvent', 'QKeyEventTransition', 'QKeySequence', 'QKeySequenceEdit',
+            'QLCDNumber', 'QLabel', 'QLatin1Char', 'QLatin1String', 'QLayout',
+            'QLayoutItem', 'QLibrary', 'QLibraryInfo', 'QLightFilter',
+            'QLightReading', 'QLightSensor', 'QLine', 'QLineEdit', 'QLineF',
+            'QLinearGradient', 'QLinkedList', 'QLinkedListIterator', 'QList',
+            'QListIterator', 'QListView', 'QListWidget', 'QListWidgetItem',
+            'QLocalServer', 'QLocalSocket', 'QLocale', 'QLockFile',
+            'QLoggingCategory', 'QLowEnergyCharacteristic',
+            'QLowEnergyController', 'QLowEnergyDescriptor', 'QLowEnergyService',
+            'QMacCocoaViewContainer', 'QMacNativeWidget', 'QMacPasteboardMime',
+            'QMacToolBar', 'QMacToolBarItem', 'QMagnetometer',
+            'QMagnetometerFilter', 'QMagnetometerReading', 'QMainWindow', 'QMap',
+            'QMapIterator', 'QMargins', 'QMarginsF', 'QMaskGenerator', 'QMatrix',
+            'QMatrix4x4', 'QMdiArea', 'QMdiSubWindow', 'QMediaAudioProbeControl',
+            'QMediaAvailabilityControl', 'QMediaBindableInterface',
+            'QMediaContainerControl', 'QMediaContent', 'QMediaControl',
+            'QMediaGaplessPlaybackControl', 'QMediaNetworkAccessControl',
+            'QMediaObject', 'QMediaPlayer', 'QMediaPlayerControl',
+            'QMediaPlaylist', 'QMediaRecorder', 'QMediaRecorderControl',
+            'QMediaResource', 'QMediaService', 'QMediaServiceCameraInfoInterface',
+            'QMediaServiceFeaturesInterface', 'QMediaServiceProviderPlugin',
+            'QMediaServiceSupportedDevicesInterface',
+            'QMediaServiceSupportedFormatsInterface', 'QMediaStreamsControl',
+            'QMediaTimeInterval', 'QMediaTimeRange', 'QMediaVideoProbeControl',
+            'QMenu', 'QMenuBar', 'QMessageAuthenticationCode', 'QMessageBox',
+            'QMessageLogContext', 'QMessageLogger', 'QMetaClassInfo',
+            'QMetaDataReaderControl', 'QMetaDataWriterControl', 'QMetaEnum',
+            'QMetaMethod', 'QMetaObject', 'QMetaProperty', 'QMetaType',
+            'QMimeData', 'QMimeDatabase', 'QMimeType', 'QModelIndex',
+            'QMouseEvent', 'QMouseEventTransition', 'QMoveEvent', 'QMovie',
+            'QMultiHash', 'QMultiMap', 'QMutableHashIterator',
+            'QMutableLinkedListIterator', 'QMutableListIterator',
+            'QMutableMapIterator', 'QMutableSetIterator',
+            'QMutableVectorIterator', 'QMutex', 'QMutexLocker',
+            'QNativeGestureEvent', 'QNdefFilter', 'QNdefMessage',
+            'QNdefNfcSmartPosterRecord', 'QNdefNfcTextRecord',
+            'QNdefNfcUriRecord', 'QNdefRecord', 'QNearFieldManager',
+            'QNearFieldShareManager', 'QNearFieldShareTarget', 'QNearFieldTarget',
+            'QNetworkAccessManager', 'QNetworkAddressEntry',
+            'QNetworkCacheMetaData', 'QNetworkConfiguration',
+            'QNetworkConfigurationManager', 'QNetworkCookie', 'QNetworkCookieJar',
+            'QNetworkDiskCache', 'QNetworkInterface', 'QNetworkProxy',
+            'QNetworkProxyFactory', 'QNetworkProxyQuery', 'QNetworkReply',
+            'QNetworkRequest', 'QNetworkSession', 'QNmeaPositionInfoSource',
+            'QObject', 'QObjectCleanupHandler', 'QOffscreenSurface',
+            'QOpenGLBuffer', 'QOpenGLContext', 'QOpenGLContextGroup',
+            'QOpenGLDebugLogger', 'QOpenGLDebugMessage',
+            'QOpenGLFramebufferObject', 'QOpenGLFramebufferObjectFormat',
+            'QOpenGLFunctions', 'QOpenGLFunctions_1_0', 'QOpenGLFunctions_1_1',
+            'QOpenGLFunctions_1_2', 'QOpenGLFunctions_1_3', 'QOpenGLFunctions_1_4',
+            'QOpenGLFunctions_1_5', 'QOpenGLFunctions_2_0', 'QOpenGLFunctions_2_1',
+            'QOpenGLFunctions_3_0', 'QOpenGLFunctions_3_1',
+            'QOpenGLFunctions_3_2_Compatibility', 'QOpenGLFunctions_3_2_Core',
+            'QOpenGLFunctions_3_3_Compatibility', 'QOpenGLFunctions_3_3_Core',
+            'QOpenGLFunctions_4_0_Compatibility', 'QOpenGLFunctions_4_0_Core',
+            'QOpenGLFunctions_4_1_Compatibility', 'QOpenGLFunctions_4_1_Core',
+            'QOpenGLFunctions_4_2_Compatibility', 'QOpenGLFunctions_4_2_Core',
+            'QOpenGLFunctions_4_3_Compatibility', 'QOpenGLFunctions_4_3_Core',
+            'QOpenGLFunctions_ES2', 'QOpenGLPaintDevice',
+            'QOpenGLPixelTransferOptions', 'QOpenGLShader',
+            'QOpenGLShaderProgram', 'QOpenGLTexture', 'QOpenGLTimeMonitor',
+            'QOpenGLTimerQuery', 'QOpenGLVersionProfile',
+            'QOpenGLVertexArrayObject', 'QOpenGLWidget', 'QOpenGLWindow',
+            'QOrientationFilter', 'QOrientationReading', 'QOrientationSensor',
+            'QPageLayout', 'QPageSetupDialog', 'QPageSize', 'QPagedPaintDevice',
+            'QPaintDevice', 'QPaintDeviceWindow', 'QPaintEngine',
+            'QPaintEngineState', 'QPaintEvent', 'QPainter', 'QPainterPath',
+            'QPainterPathStroker', 'QPair', 'QPalette', 'QPanGesture',
+            'QParallelAnimationGroup', 'QPauseAnimation', 'QPdfWriter', 'QPen',
+            'QPersistentModelIndex', 'QPicture', 'QPictureFormatPlugin',
+            'QPictureIO', 'QPinchGesture', 'QPixelFormat', 'QPixmap',
+            'QPixmapCache', 'QPlace', 'QPlaceAttribute', 'QPlaceCategory',
+            'QPlaceContactDetail', 'QPlaceContent', 'QPlaceContentReply',
+            'QPlaceContentRequest', 'QPlaceDetailsReply', 'QPlaceEditorial',
+            'QPlaceIcon', 'QPlaceIdReply', 'QPlaceImage', 'QPlaceManager',
+            'QPlaceManagerEngine', 'QPlaceMatchReply', 'QPlaceMatchRequest',
+            'QPlaceProposedSearchResult', 'QPlaceRatings', 'QPlaceReply',
+            'QPlaceResult', 'QPlaceReview', 'QPlaceSearchReply',
+            'QPlaceSearchRequest', 'QPlaceSearchResult',
+            'QPlaceSearchSuggestionReply', 'QPlaceSupplier', 'QPlaceUser',
+            'QPlainTextDocumentLayout', 'QPlainTextEdit',
+            'QPlatformSystemTrayIcon', 'QPluginLoader', 'QPoint', 'QPointF',
+            'QPointer', 'QPolygon', 'QPolygonF', 'QPressureFilter',
+            'QPressureReading', 'QPressureSensor', 'QPrintDialog', 'QPrintEngine',
+            'QPrintPreviewDialog', 'QPrintPreviewWidget', 'QPrinter',
+            'QPrinterInfo', 'QProcess', 'QProcessEnvironment', 'QProgressBar',
+            'QProgressDialog', 'QPropertyAnimation', 'QProximityFilter',
+            'QProximityReading', 'QProximitySensor', 'QProxyStyle',
+            'QPushButton', 'QQmlAbstractProfilerAdapter',
+            'QQmlAbstractUrlInterceptor', 'QQmlApplicationEngine',
+            'QQmlComponent', 'QQmlContext', 'QQmlEngine', 'QQmlError',
+            'QQmlExpression', 'QQmlExtensionPlugin', 'QQmlFileSelector',
+            'QQmlImageProviderBase', 'QQmlIncubationController', 'QQmlIncubator',
+            'QQmlListProperty', 'QQmlListReference', 'QQmlNdefRecord',
+            'QQmlNetworkAccessManagerFactory', 'QQmlParserStatus', 'QQmlProperty',
+            'QQmlPropertyMap', 'QQmlPropertyValueSource', 'QQmlScriptString',
+            'QQuaternion', 'QQueue', 'QQuickFramebufferObject', 'QQuickImageProvider',
+            'QQuickItem', 'QQuickItemGrabResult', 'QQuickPaintedItem',
+            'QQuickRenderControl', 'QQuickTextDocument', 'QQuickTextureFactory',
+            'QQuickView', 'QQuickWidget', 'QQuickWindow', 'QTouchEventSequence',
+            'Qoutputrange', 'QRadialGradient', 'QRadioButton', 'QRadioData',
+            'QRadioDataControl', 'QRadioTuner', 'QRadioTunerControl',
+            'QRasterPaintEngine', 'QRasterWindow', 'QRawFont', 'QReadLocker',
+            'QReadWriteLock', 'QRect', 'QRectF', 'QRegExp', 'QRegExpValidator',
+            'QRegion', 'QRegularExpression', 'QRegularExpressionMatch',
+            'QRegularExpressionMatchIterator', 'QRegularExpressionValidator',
+            'QResizeEvent', 'QResource', 'QRotationFilter', 'QRotationReading',
+            'QRotationSensor', 'QRubberBand', 'QRunnable', 'QSGAbstractRenderer',
+            'QSGBasicGeometryNode', 'QSGClipNode', 'QSGDynamicTexture',
+            'QSGEngine', 'QSGFlatColorMaterial', 'QSGGeometry', 'QSGGeometryNode',
+            'QSGMaterial', 'QSGMaterialShader', 'QSGMaterialType', 'QSGNode',
+            'QSGOpacityNode', 'QSGOpaqueTextureMaterial', 'QSGSimpleMaterial',
+            'QSGSimpleMaterialShader', 'QSGSimpleRectNode',
+            'QSGSimpleTextureNode', 'QSGTexture', 'QSGTextureMaterial',
+            'QSGTextureProvider', 'QSGTransformNode', 'QSGVertexColorMaterial',
+            'QSaveFile', 'QScopedArrayPointer', 'QScopedPointer',
+            'QScopedValueRollback', 'QScreen', 'QScriptClass',
+            'QScriptClassPropertyIterator', 'QScriptContext',
+            'QScriptContextInfo', 'QScriptEngine', 'QScriptEngineAgent',
+            'QScriptEngineDebugger', 'QScriptExtensionPlugin', 'QScriptProgram',
+            'QScriptString', 'QScriptSyntaxCheckResult', 'QScriptValue',
+            'QScriptValueIterator', 'QScriptable', 'QScrollArea', 'QScrollBar',
+            'QScrollEvent', 'QScrollPrepareEvent', 'QScroller',
+            'QScrollerProperties', 'QSemaphore', 'QSensor', 'QSensorBackend',
+            'QSensorBackendFactory', 'QSensorChangesInterface', 'QSensorFilter',
+            'QSensorGesture', 'QSensorGestureManager',
+            'QSensorGesturePluginInterface', 'QSensorGestureRecognizer',
+            'QSensorManager', 'QSensorPluginInterface', 'QSensorReading',
+            'QSequentialAnimationGroup', 'QSequentialIterable', 'QSerialPort',
+            'QSerialPortInfo', 'QSessionManager', 'QSet', 'QSetIterator',
+            'QSettings', 'QSharedData', 'QSharedDataPointer', 'QSharedMemory',
+            'QSharedPointer', 'QShortcut', 'QShortcutEvent', 'QShowEvent',
+            'QSignalBlocker', 'QSignalMapper', 'QSignalSpy', 'QSignalTransition',
+            'QSimpleXmlNodeModel', 'QSize', 'QSizeF', 'QSizeGrip', 'QSizePolicy',
+            'QSlider', 'QSocketNotifier', 'QSortFilterProxyModel', 'QSound',
+            'QSoundEffect', 'QSourceLocation', 'QSpacerItem', 'QSpinBox',
+            'QSplashScreen', 'QSplitter', 'QSplitterHandle', 'QSqlDatabase',
+            'QSqlDriver', 'QSqlDriverCreator', 'QSqlDriverCreatorBase',
+            'QSqlDriverPlugin', 'QSqlError', 'QSqlField', 'QSqlIndex',
+            'QSqlQuery', 'QSqlQueryModel', 'QSqlRecord', 'QSqlRelation',
+            'QSqlRelationalDelegate', 'QSqlRelationalTableModel', 'QSqlResult',
+            'QSqlTableModel', 'QSslCertificate', 'QSslCertificateExtension',
+            'QSslCipher', 'QSslConfiguration', 'QSslError', 'QSslKey',
+            'QSslSocket', 'QStack', 'QStackedLayout', 'QStackedWidget',
+            'QStandardItem', 'QStandardItemEditorCreator', 'QStandardItemModel',
+            'QStandardPaths', 'QState', 'QStateMachine', 'QStaticPlugin',
+            'QStaticText', 'QStatusBar', 'QStatusTipEvent', 'QStorageInfo',
+            'QString', 'QStringList', 'QStringListModel', 'QStringMatcher',
+            'QStringRef', 'QStyle', 'QStyleFactory', 'QStyleHintReturn',
+            'QStyleHintReturnMask', 'QStyleHintReturnVariant', 'QStyleHints',
+            'QStyleOption', 'QStyleOptionButton', 'QStyleOptionComboBox',
+            'QStyleOptionComplex', 'QStyleOptionDockWidget',
+            'QStyleOptionFocusRect', 'QStyleOptionFrame',
+            'QStyleOptionGraphicsItem', 'QStyleOptionGroupBox',
+            'QStyleOptionHeader', 'QStyleOptionMenuItem',
+            'QStyleOptionProgressBar', 'QStyleOptionRubberBand',
+            'QStyleOptionSizeGrip', 'QStyleOptionSlider',
+            'QStyleOptionSpinBox', 'QStyleOptionTab',
+            'QStyleOptionTabBarBase', 'QStyleOptionTabWidgetFrame',
+            'QStyleOptionTitleBar', 'QStyleOptionToolBar',
+            'QStyleOptionToolBox', 'QStyleOptionToolButton',
+            'QStyleOptionViewItem', 'QStylePainter', 'QStylePlugin',
+            'QStyledItemDelegate', 'QSupportedWritingSystems', 'QSurface',
+            'QSurfaceFormat', 'QSvgGenerator', 'QSvgRenderer', 'QSvgWidget',
+            'QSwipeGesture', 'QSyntaxHighlighter', 'QSysInfo', 'QSystemSemaphore',
+            'QSystemTrayIcon', 'QTabBar', 'QTabWidget', 'QTableView',
+            'QTableWidget', 'QTableWidgetItem', 'QTableWidgetSelectionRange',
+            'QTabletEvent', 'QTapAndHoldGesture', 'QTapFilter', 'QTapGesture',
+            'QTapReading', 'QTapSensor', 'QTcpServer', 'QTcpSocket',
+            'QTemporaryDir', 'QTemporaryFile', 'QTestEventList', 'QTextBlock',
+            'QTextBlockFormat', 'QTextBlockGroup', 'QTextBlockUserData',
+            'QTextBoundaryFinder', 'QTextBrowser', 'QTextCharFormat',
+            'QTextCodec', 'QTextCursor', 'QTextDecoder', 'QTextDocument',
+            'QTextDocumentFragment', 'QTextDocumentWriter', 'QTextEdit',
+            'QTextEncoder', 'QTextFormat', 'QTextFragment', 'QTextFrame',
+            'QTextFrameFormat', 'QTextImageFormat', 'QTextInlineObject',
+            'QTextItem', 'QTextLayout', 'QTextLength', 'QTextLine', 'QTextList',
+            'QTextListFormat', 'QTextObject', 'QTextObjectInterface',
+            'QTextOption', 'QTextStream', 'QTextTable', 'QTextTableCell',
+            'QTextTableCellFormat', 'QTextTableFormat', 'QThread', 'QThreadPool',
+            'QThreadStorage', 'QTileRules', 'QTiltFilter', 'QTiltReading',
+            'QTiltSensor', 'QTime', 'QTimeEdit', 'QTimeLine', 'QTimeZone',
+            'QTimer', 'QTimerEvent', 'QToolBar', 'QToolBox', 'QToolButton',
+            'QToolTip', 'QTouchDevice', 'QTouchEvent', 'QTransform',
+            'QTranslator', 'QTreeView', 'QTreeWidget', 'QTreeWidgetItem',
+            'QTreeWidgetItemIterator', 'QUdpSocket', 'QUiLoader', 'QUndoCommand',
+            'QUndoGroup', 'QUndoStack', 'QUndoView', 'QUnhandledException',
+            'QUrl', 'QUrlQuery', 'QUuid', 'QVBoxLayout', 'QValidator',
+            'QVarLengthArray', 'QVariant', 'QVariantAnimation', 'QVector',
+            'QVector2D', 'QVector3D', 'QVector4D', 'QVectorIterator',
+            'QVideoDeviceSelectorControl', 'QVideoEncoderSettings',
+            'QVideoEncoderSettingsControl', 'QVideoFrame', 'QVideoProbe',
+            'QVideoRendererControl', 'QVideoSurfaceFormat', 'QVideoWidget',
+            'QVideoWidgetControl', 'QVideoWindowControl', 'QWGLNativeContext',
+            'QWaitCondition', 'QWeakPointer', 'QWebChannel',
+            'QWebChannelAbstractTransport', 'QWebDatabase', 'QWebElement',
+            'QWebElementCollection', 'QWebEngineHistory', 'QWebEngineHistoryItem',
+            'QWebEnginePage', 'QWebEngineSettings', 'QWebEngineView', 'QWebFrame',
+            'QWebHistory', 'QWebHistoryInterface', 'QWebHistoryItem',
+            'QWebHitTestResult', 'QWebInspector', 'QWebPage', 'QWebPluginFactory',
+            'QWebSecurityOrigin', 'QWebSettings', 'QWebSocket',
+            'QWebSocketCorsAuthenticator', 'QWebSocketServer', 'QWebView',
+            'QWhatsThis', 'QWhatsThisClickedEvent', 'QWheelEvent', 'QWidget',
+            'QWidgetAction', 'QWidgetItem', 'QWinEventNotifier', 'QWinJumpList',
+            'QWinJumpListCategory', 'QWinJumpListItem', 'QWinMime',
+            'QWinTaskbarButton', 'QWinTaskbarProgress', 'QWinThumbnailToolBar',
+            'QWinThumbnailToolButton', 'QWindow', 'QWindowStateChangeEvent',
+            'QWizard', 'QWizardPage', 'QWriteLocker', 'QX11Info',
+            'QXcbWindowFunctions', 'QXmlAttributes', 'QXmlContentHandler',
+            'QXmlDTDHandler', 'QXmlDeclHandler', 'QXmlDefaultHandler',
+            'QXmlEntityResolver','QXmlErrorHandler', 'QXmlFormatter',
+            'QXmlInputSource', 'QXmlItem', 'QXmlLexicalHandler', 'QXmlLocator',
+            'QXmlName', 'QXmlNamePool', 'QXmlNamespaceSupport',
+            'QXmlNodeModelIndex', 'QXmlParseException', 'QXmlQuery',
+            'QXmlReader', 'QXmlResultItems', 'QXmlSchema', 'QXmlSchemaValidator',
+            'QXmlSerializer', 'QXmlSimpleReader', 'QXmlStreamAttribute',
+            'QXmlStreamAttributes', 'QXmlStreamEntityDeclaration',
+            'QXmlStreamEntityResolver', 'QXmlStreamNamespaceDeclaration',
+            'QXmlStreamNotationDeclaration', 'QXmlStreamReader',
+            'QXmlStreamWriter'
             )
         ),
     'SYMBOLS' => array(
diff --git a/htdocs/application/libraries/geshi/geshi/cpp-winapi.php b/htdocs/application/libraries/geshi/geshi/cpp-winapi.php
index f642616..b8bc6cc 100644
--- a/htdocs/application/libraries/geshi/geshi/cpp-winapi.php
+++ b/htdocs/application/libraries/geshi/geshi/cpp-winapi.php
@@ -8,7 +8,7 @@
  *  - Jack Lloyd (lloyd@randombit.net)
  *  - Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2004 Dennis Bayer, Nigel McNie, 2012 Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/09/27
  *
  * C++ language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/cpp.php b/htdocs/application/libraries/geshi/geshi/cpp.php
index 05cadf0..1439dfe 100644
--- a/htdocs/application/libraries/geshi/geshi/cpp.php
+++ b/htdocs/application/libraries/geshi/geshi/cpp.php
@@ -7,13 +7,15 @@
  *  - M. Uli Kusterer (witness.of.teachtext@gmx.net)
  *  - Jack Lloyd (lloyd@randombit.net)
  * Copyright: (c) 2004 Dennis Bayer, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/09/27
  *
  * C++ language file for GeSHi.
  *
  * CHANGES
  * -------
+ * 2013/11/06
+ *  -  Added nullptr from c++11 & others
  * 2008/05/23 (1.0.7.22)
  *  -  Added description of extra language features (SF#1970248)
  * 2004/XX/XX (1.0.2)
@@ -101,10 +103,13 @@ $language_data = array (
             'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
             'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
             'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
-            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class'
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class', 'nullptr',
+            'decltype', 'override', 'final', 'noexcept', 'alignas', 'alignof', 'noreturn',
+            'constexpr', 'and', 'and_eq', 'asm', 'bitand', 'bitor', 'thread_local',
+            'static_assert', 'compl', 'or', 'or_eq', 'xor', 'xor_eq', 'not', 'not_eq'
             ),
         3 => array(
-            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this', 'export',
             'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
             'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
             'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
@@ -126,11 +131,12 @@ $language_data = array (
             'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
             ),
         4 => array(
-            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
-            'register', 'short', 'shortint', 'signed', 'static', 'struct',
-            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
-            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
-            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+            'auto', 'bool', 'char', 'char16_t', 'char32_t', 'const', 'double', 'float',
+            'int', 'long', 'longint','register', 'short', 'shortint', 'signed',
+            'static', 'struct', 'typedef', 'union', 'unsigned', 'void', 'volatile',
+            'extern', 'jmp_buf','signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t',
+            'FILE', 'fpos_t', 'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+            'mutable',
 
             'int8', 'int16', 'int32', 'int64',
             'uint8', 'uint16', 'uint32', 'uint64',
diff --git a/htdocs/application/libraries/geshi/geshi/csharp.php b/htdocs/application/libraries/geshi/geshi/csharp.php
index 14f0fa0..a5a0f11 100644
--- a/htdocs/application/libraries/geshi/geshi/csharp.php
+++ b/htdocs/application/libraries/geshi/geshi/csharp.php
@@ -5,13 +5,15 @@
  * Author: Alan Juden (alan@judenware.org)
  * Revised by: Michael Mol (mikemol@gmail.com)
  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * C# language file for GeSHi.
  *
  * CHANGES
  * -------
+ * 2015/04/14
+ *  -  Added C# 5.0 and 6.0 missing keywords and #pragma directive
  * 2012/06/18 (1.0.8.11)
  *  -  Added missing keywords (Christian Stelzmann)
  * 2009/04/03 (1.0.8.6)
@@ -62,7 +64,8 @@ $language_data = array (
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-            'abstract', 'add', 'as', 'base', 'break', 'by', 'case', 'catch', 'const', 'continue',
+            'abstract', 'add', 'as', 'async', 'await', 'base',
+            'break', 'by', 'case', 'catch', 'const', 'continue',
             'default', 'do', 'else', 'event', 'explicit', 'extern', 'false',
             'finally', 'fixed', 'for', 'foreach', 'from', 'get', 'goto', 'group', 'if',
             'implicit', 'in', 'into', 'internal', 'join', 'lock', 'namespace', 'null',
@@ -74,10 +77,10 @@ $language_data = array (
             ),
         2 => array(
             '#elif', '#endif', '#endregion', '#else', '#error', '#define', '#if',
-            '#line', '#region', '#undef', '#warning'
+            '#line', '#pragma', '#region', '#undef', '#warning'
             ),
         3 => array(
-            'checked', 'is', 'new', 'sizeof', 'typeof', 'unchecked'
+            'checked', 'is', 'new', 'nameof', 'sizeof', 'typeof', 'unchecked'
             ),
         4 => array(
             'bool', 'byte', 'char', 'class', 'decimal', 'delegate', 'double',
diff --git a/htdocs/application/libraries/geshi/geshi/css.php b/htdocs/application/libraries/geshi/geshi/css.php
index bfb6e0e..5d15fad 100644
--- a/htdocs/application/libraries/geshi/geshi/css.php
+++ b/htdocs/application/libraries/geshi/geshi/css.php
@@ -4,14 +4,14 @@
  * -------
  * Author: Nigel McNie (nigel@geshi.org), Zéfling (zefling@ikilote.net)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/18
  *
  * CSS language file for GeSHi.
  *
  * CHANGES
  * -------
- * 2014/07/14 (1.0.8.12)
+ * 2014/07/14 (1.0.8.13)
  *  - update for current CSS3 (properties, value, expression, unites & color)
  *  - remove pseudo class regex
  *  - add rules regex
@@ -53,13 +53,13 @@
  *
  ************************************************************************************/
 
-$language_data = array (
+$language_data = array(
     'LANG_NAME' => 'CSS',
     'COMMENT_SINGLE' => array(),
     'COMMENT_MULTI' => array('/*' => '*/'),
     'COMMENT_REGEXP' => array(
         2 => "/(?<=\\()\\s*(?:(?:[a-z0-9]+?:\\/\\/)?[a-z0-9_\\-\\.\\/:]+?)?[a-z]+?\\.[a-z]+?(\\?[^\)]+?)?\\s*?(?=\\))/i"
-        ),
+    ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array('"', "'"),
     'ESCAPE_CHAR' => '',
@@ -70,194 +70,795 @@ $language_data = array (
         2 => "#\\\\[\da-fA-F]{1,6}\s?#i",
         //Unicode Char Specs
         //3 => "#\\\\u[\da-fA-F]{1,8}#i",
-        ),
+    ),
     'KEYWORDS' => array(
         // properties
         1 => array(
-            'align-content','align-items','align-self','all','animation',
-            'animation-delay','animation-direction','animation-duration',
-            'animation-fill-mode','animation-iteration-count','animation-name',
-            'animation-play-state','animation-timing-function',
-            'backface-visibility','background','background-attachment',
-            'background-blend-mode','background-clip','background-color',
-            'background-image','background-origin','background-position',
-            'background-repeat','background-size','border','border-bottom',
-            'border-bottom-color','border-bottom-left-radius',
-            'border-bottom-right-radius','border-bottom-style',
-            'border-bottom-width','border-collapse','border-color',
-            'border-image','border-image-outset','border-image-repeat',
-            'border-image-slice','border-image-source','border-image-width',
-            'border-left','border-left-color','border-left-style',
-            'border-left-width','border-radius','border-right',
-            'border-right-color','border-right-style','border-right-width',
-            'border-spacing','border-style','border-top','border-top-color',
-            'border-top-left-radius','border-top-right-radius',
-            'border-top-style','border-top-width','border-width','bottom',
-            'box-decoration-break','box-shadow','box-sizing','break-after',
-            'break-before','break-inside','caption-side','clear','clip',
-            'clip-path','color','columns','column-count','column-fill',
-            'column-gap','column-rule','column-rule-color','column-rule-style',
-            'column-rule-width','column-span','column-width','content',
-            'counter-increment','counter-reset','cursor','direction','display',
-            'empty-cells','filter','flex','flex-basis','flex-direction',
-            'flex-flow','flex-grow','flex-shrink','flex-wrap','float','font',
-            'font-family','font-feature-settings','font-kerning',
-            'font-language-override','font-size','font-size-adjust',
-            'font-stretch','font-style','font-synthesis','font-variant',
-            'font-variant-alternates','font-variant-caps',
-            'font-variant-east-asian','font-variant-ligatures',
-            'font-variant-numeric','font-variant-position','font-weight','grid',
-            'grid-area','grid-auto-columns','grid-auto-flow',
-            'grid-auto-position','grid-auto-rows','grid-column',
-            'grid-column-start','grid-column-end','grid-row','grid-row-start',
-            'grid-row-end','grid-template','grid-template-areas',
-            'grid-template-rows','grid-template-columns','height','hyphens',
-            'icon','image-rendering','image-resolution','image-orientation',
-            'ime-mode','justify-content','left','letter-spacing','line-break',
-            'line-height','list-style','list-style-image','list-style-position',
-            'list-style-type','margin','margin-bottom','margin-left',
-            'margin-right','margin-top','marks','mask','mask-type','max-height',
-            'max-width','min-height','min-width','mix-blend-mode','nav-down',
-            'nav-index','nav-left','nav-right','nav-up','object-fit',
-            'object-position','opacity','order','orphans','outline',
-            'outline-color','outline-offset','outline-style','outline-width',
-            'overflow','overflow-wrap','overflow-x','overflow-y',
-            'overflow-clip-box','padding','padding-bottom','padding-left',
-            'padding-right','padding-top','page-break-after','page-break-before',
-            'page-break-inside','perspective','perspective-origin',
-            'pointer-events','position','quotes','resize','right',
-            'shape-image-threshold','shape-margin','shape-outside',
-            'table-layout','tab-size','text-align','text-align-last',
-            'text-combine-horizontal','text-decoration','text-decoration-color',
-            'text-decoration-line','text-decoration-style','text-indent',
-            'text-orientation','text-overflow','text-rendering','text-shadow',
-            'text-transform','text-underline-position','top','touch-action',
-            'transform','transform-origin','transform-style','transition',
-            'transition-delay','transition-duration','transition-property',
-            'transition-timing-function','unicode-bidi','unicode-range',
-            'vertical-align','visibility','white-space','widows','width',
-            'will-change','word-break','word-spacing','word-wrap',
-            'writing-mode','z-index'
-            ),
+            'align-content',
+            'align-items',
+            'align-self',
+            'all',
+            'animation',
+            'animation-delay',
+            'animation-direction',
+            'animation-duration',
+            'animation-fill-mode',
+            'animation-iteration-count',
+            'animation-name',
+            'animation-play-state',
+            'animation-timing-function',
+            'backface-visibility',
+            'background',
+            'background-attachment',
+            'background-blend-mode',
+            'background-clip',
+            'background-color',
+            'background-image',
+            'background-origin',
+            'background-position',
+            'background-repeat',
+            'background-size',
+            'border',
+            'border-bottom',
+            'border-bottom-color',
+            'border-bottom-left-radius',
+            'border-bottom-right-radius',
+            'border-bottom-style',
+            'border-bottom-width',
+            'border-collapse',
+            'border-color',
+            'border-image',
+            'border-image-outset',
+            'border-image-repeat',
+            'border-image-slice',
+            'border-image-source',
+            'border-image-width',
+            'border-left',
+            'border-left-color',
+            'border-left-style',
+            'border-left-width',
+            'border-radius',
+            'border-right',
+            'border-right-color',
+            'border-right-style',
+            'border-right-width',
+            'border-spacing',
+            'border-style',
+            'border-top',
+            'border-top-color',
+            'border-top-left-radius',
+            'border-top-right-radius',
+            'border-top-style',
+            'border-top-width',
+            'border-width',
+            'bottom',
+            'box-decoration-break',
+            'box-shadow',
+            'box-sizing',
+            'break-after',
+            'break-before',
+            'break-inside',
+            'caption-side',
+            'clear',
+            'clip',
+            'clip-path',
+            'color',
+            'columns',
+            'column-count',
+            'column-fill',
+            'column-gap',
+            'column-rule',
+            'column-rule-color',
+            'column-rule-style',
+            'column-rule-width',
+            'column-span',
+            'column-width',
+            'content',
+            'counter-increment',
+            'counter-reset',
+            'cursor',
+            'direction',
+            'display',
+            'empty-cells',
+            'fill',
+            'fill-rule',
+            'fill-opacity',
+            'filter',
+            'flex',
+            'flex-basis',
+            'flex-direction',
+            'flex-flow',
+            'flex-grow',
+            'flex-shrink',
+            'flex-wrap',
+            'float',
+            'font',
+            'font-family',
+            'font-feature-settings',
+            'font-kerning',
+            'font-language-override',
+            'font-size',
+            'font-size-adjust',
+            'font-stretch',
+            'font-style',
+            'font-synthesis',
+            'font-variant',
+            'font-variant-alternates',
+            'font-variant-caps',
+            'font-variant-east-asian',
+            'font-variant-ligatures',
+            'font-variant-numeric',
+            'font-variant-position',
+            'font-weight',
+            'grid',
+            'grid-area',
+            'grid-auto-columns',
+            'grid-auto-flow',
+            'grid-auto-position',
+            'grid-auto-rows',
+            'grid-column',
+            'grid-column-start',
+            'grid-column-end',
+            'grid-row',
+            'grid-row-start',
+            'grid-row-end',
+            'grid-template',
+            'grid-template-areas',
+            'grid-template-rows',
+            'grid-template-columns',
+            'height',
+            'hyphens',
+            'icon',
+            'image-rendering',
+            'image-resolution',
+            'image-orientation',
+            'ime-mode',
+            'justify-content',
+            'left',
+            'letter-spacing',
+            'line-break',
+            'line-height',
+            'list-style',
+            'list-style-image',
+            'list-style-position',
+            'list-style-type',
+            'margin',
+            'margin-bottom',
+            'margin-left',
+            'margin-right',
+            'margin-top',
+            'marks',
+            'mask',
+            'mask-type',
+            'max-height',
+            'max-width',
+            'min-height',
+            'min-width',
+            'mix-blend-mode',
+            'nav-down',
+            'nav-index',
+            'nav-left',
+            'nav-right',
+            'nav-up',
+            'object-fit',
+            'object-position',
+            'opacity',
+            'order',
+            'orphans',
+            'outline',
+            'outline-color',
+            'outline-offset',
+            'outline-style',
+            'outline-width',
+            'overflow',
+            'overflow-wrap',
+            'overflow-x',
+            'overflow-y',
+            'overflow-clip-box',
+            'padding',
+            'padding-bottom',
+            'padding-left',
+            'padding-right',
+            'padding-top',
+            'page-break-after',
+            'page-break-before',
+            'page-break-inside',
+            'perspective',
+            'perspective-origin',
+            'pointer-events',
+            'position',
+            'quotes',
+            'resize',
+            'right',
+            'shape-image-threshold',
+            'shape-margin',
+            'shape-outside',
+            'stroke',
+            'stroke-width',
+            'stroke-linecap',
+            'stroke-linejoin',
+            'stroke-miterlimit',
+            'stroke-dasharray',
+            'stroke-dashoffset',
+            'table-layout',
+            'tab-size',
+            'text-align',
+            'text-align-last',
+            'text-combine-horizontal',
+            'text-decoration',
+            'text-decoration-color',
+            'text-decoration-line',
+            'text-decoration-style',
+            'text-indent',
+            'text-orientation',
+            'text-overflow',
+            'text-rendering',
+            'text-shadow',
+            'text-transform',
+            'text-underline-position',
+            'top',
+            'touch-action',
+            'transform',
+            'transform-origin',
+            'transform-style',
+            'transition',
+            'transition-delay',
+            'transition-duration',
+            'transition-property',
+            'transition-timing-function',
+            'unicode-bidi',
+            'unicode-range',
+            'vertical-align',
+            'visibility',
+            'white-space',
+            'widows',
+            'width',
+            'will-change',
+            'word-break',
+            'word-spacing',
+            'word-wrap',
+            'writing-mode',
+            'z-index'
+        ),
         // value
         2 => array(
-            'absolute','activeborder','activecaption','after-white-space',
-            'ahead','alternate','always','appworkspace','aqua','armenian','auto',
-            'avoid','background','backwards','baseline','below','bidi-override',
-            'blink','block','block clear','block width','block-axis','bold',
-            'bolder','border','border-box','both','bottom','break-word','button',
-            'button-bevel','buttonface','buttonhighlight','buttonshadow',
-            'buttontext','capitalize','caption','captiontext','caret','center',
-            'checkbox','circle','cjk-ideographic','clip','close-quote',
-            'collapse','compact','condensed','content','content-box',
-            'continuous','crop','cross','crosshair','cursive','dashed','decimal',
-            'decimal-leading-zero','default','disc','discard','dot-dash',
-            'dot-dot-dash','dotted','double','down','e-resize','element',
-            'ellipsis','embed','end','expanded','extra-condensed',
-            'extra-expanded','fantasy','fast','fixed','forwards','georgian',
-            'graytext','groove','hand','hebrew','help','hidden','hide','higher',
-            'highlight','highlighttext','hiragana','hiragana-iroha',
-            'horizontal','icon','ignore','inactiveborder','inactivecaption',
-            'inactivecaptiontext','infinite','infobackground','infotext',
-            'inherit','initial','inline','inline-axis','inline-block',
-            'inline-table','inset','inside','intrinsic','invert','italic',
-            'justify','katakana','katakana-iroha','landscape','large','larger',
-            'left','level','lighter','lime','line-through','list-item','listbox',
-            'listitem','logical','loud','lower','lower-alpha','lower-greek',
-            'lower-latin','lower-roman','lowercase','ltr','marker','match',
-            'medium','menu','menulist','menulist-button','menulist-text',
-            'menulist-textfield','menutext','message-box','middle',
-            'min-intrinsic','mix','monospace','move','multiple','n-resize',
-            'narrower','ne-resize','no-close','no-close-quote','no-open-quote',
-            'no-repeat','none','normal','nowrap','nw-resize','oblique','once',
-            'open-quote','outset','outside','overline','padding','pointer',
-            'portrait','pre','pre-line','pre-wrap','push-button','radio',
-            'read-only','read-write','read-write-plaintext-only','relative',
-            'repeat','repeat-x','repeat-y','reverse','ridge','right','round',
-            'rtl','run-in','s-resize','sans-serif','scroll','scrollbar',
-            'scrollbarbutton-down','scrollbarbutton-left',
-            'scrollbarbutton-right','scrollbarbutton-up',
-            'scrollbargripper-horizontal','scrollbargripper-vertical',
-            'scrollbarthumb-horizontal','scrollbarthumb-vertical',
-            'scrollbartrack-horizontal','scrollbartrack-vertical',
-            'se-resize','searchfield','searchfield-close','searchfield-results',
-            'semi-condensed','semi-expanded','separate','serif','show','single',
-            'skip-white-space','slide','slider-horizontal','slider-vertical',
-            'sliderthumb-horizontal','sliderthumb-vertical','slow','small',
-            'small-caps','small-caption','smaller','solid','space','square',
-            'square-button','start','static','status-bar','stretch','sub',
-            'super','sw-resize','table','table-caption','table-cell',
-            'table-column','table-column-group','table-footer-group',
-            'table-header-group','table-row','table-row-group','text',
-            'text-bottom','text-top','textfield','thick','thin',
-            'threeddarkshadow','threedface','threedhighlight',
-            'threedlightshadow','threedshadow','top','ultra-condensed',
-            'ultra-expanded','underline','unfurl','up','upper-alpha',
-            'upper-latin','upper-roman','uppercase','vertical','visible',
-            'visual','w-resize','wait','wave','wider','window','windowframe',
-            'windowtext','x-large','x-small','xx-large','xx-small'
-            ),
+            'absolute',
+            'activeborder',
+            'activecaption',
+            'after-white-space',
+            'ahead',
+            'alternate',
+            'always',
+            'appworkspace',
+            'armenian',
+            'auto',
+            'avoid',
+            'background',
+            'backwards',
+            'baseline',
+            'below',
+            'bevel',
+            'bidi-override',
+            'blink',
+            'block',
+            'block clear',
+            'block width',
+            'block-axis',
+            'bold',
+            'bolder',
+            'border',
+            'border-box',
+            'both',
+            'bottom',
+            'break-word',
+            'butt',
+            'button',
+            'button-bevel',
+            'buttonface',
+            'buttonhighlight',
+            'buttonshadow',
+            'buttontext',
+            'capitalize',
+            'caption',
+            'captiontext',
+            'caret',
+            'center',
+            'checkbox',
+            'circle',
+            'cjk-ideographic',
+            'clip',
+            'close-quote',
+            'collapse',
+            'compact',
+            'condensed',
+            'content',
+            'content-box',
+            'continuous',
+            'crop',
+            'cross',
+            'crosshair',
+            'currentColor',
+            'cursive',
+            'dashed',
+            'decimal',
+            'decimal-leading-zero',
+            'default',
+            'disc',
+            'discard',
+            'dot-dash',
+            'dot-dot-dash',
+            'dotted',
+            'double',
+            'down',
+            'e-resize',
+            'element',
+            'ellipsis',
+            'embed',
+            'end',
+            'evenodd',
+            'expanded',
+            'extra-condensed',
+            'extra-expanded',
+            'fantasy',
+            'fast',
+            'fixed',
+            'forwards',
+            'georgian',
+            'graytext',
+            'groove',
+            'hand',
+            'hebrew',
+            'help',
+            'hidden',
+            'hide',
+            'higher',
+            'highlight',
+            'highlighttext',
+            'hiragana',
+            'hiragana-iroha',
+            'horizontal',
+            'icon',
+            'ignore',
+            'inactiveborder',
+            'inactivecaption',
+            'inactivecaptiontext',
+            'infinite',
+            'infobackground',
+            'infotext',
+            'inherit',
+            'initial',
+            'inline',
+            'inline-axis',
+            'inline-block',
+            'inline-table',
+            'inset',
+            'inside',
+            'intrinsic',
+            'invert',
+            'italic',
+            'justify',
+            'katakana',
+            'katakana-iroha',
+            'landscape',
+            'large',
+            'larger',
+            'left',
+            'level',
+            'lighter',
+            'line-through',
+            'list-item',
+            'listbox',
+            'listitem',
+            'logical',
+            'loud',
+            'lower',
+            'lower-alpha',
+            'lower-greek',
+            'lower-latin',
+            'lower-roman',
+            'lowercase',
+            'ltr',
+            'marker',
+            'match',
+            'medium',
+            'menu',
+            'menulist',
+            'menulist-button',
+            'menulist-text',
+            'menulist-textfield',
+            'menutext',
+            'message-box',
+            'middle',
+            'min-intrinsic',
+            'miter',
+            'mix',
+            'monospace',
+            'move',
+            'multiple',
+            'n-resize',
+            'narrower',
+            'ne-resize',
+            'no-close',
+            'no-close-quote',
+            'no-open-quote',
+            'no-repeat',
+            'none',
+            'nonzero',
+            'normal',
+            'nowrap',
+            'nw-resize',
+            'oblique',
+            'once',
+            'open-quote',
+            'outset',
+            'outside',
+            'overline',
+            'padding',
+            'pointer',
+            'portrait',
+            'pre',
+            'pre-line',
+            'pre-wrap',
+            'push-button',
+            'radio',
+            'read-only',
+            'read-write',
+            'read-write-plaintext-only',
+            'relative',
+            'repeat',
+            'repeat-x',
+            'repeat-y',
+            'reverse',
+            'ridge',
+            'right',
+            'round',
+            'rtl',
+            'run-in',
+            's-resize',
+            'sans-serif',
+            'scroll',
+            'scrollbar',
+            'scrollbarbutton-down',
+            'scrollbarbutton-left',
+            'scrollbarbutton-right',
+            'scrollbarbutton-up',
+            'scrollbargripper-horizontal',
+            'scrollbargripper-vertical',
+            'scrollbarthumb-horizontal',
+            'scrollbarthumb-vertical',
+            'scrollbartrack-horizontal',
+            'scrollbartrack-vertical',
+            'se-resize',
+            'searchfield',
+            'searchfield-close',
+            'searchfield-results',
+            'semi-condensed',
+            'semi-expanded',
+            'separate',
+            'serif',
+            'show',
+            'single',
+            'skip-white-space',
+            'slide',
+            'slider-horizontal',
+            'slider-vertical',
+            'sliderthumb-horizontal',
+            'sliderthumb-vertical',
+            'slow',
+            'small',
+            'small-caps',
+            'small-caption',
+            'smaller',
+            'solid',
+            'space',
+            'square',
+            'square-button',
+            'start',
+            'static',
+            'status-bar',
+            'stretch',
+            'sub',
+            'super',
+            'sw-resize',
+            'table',
+            'table-caption',
+            'table-cell',
+            'table-column',
+            'table-column-group',
+            'table-footer-group',
+            'table-header-group',
+            'table-row',
+            'table-row-group',
+            'text',
+            'text-bottom',
+            'text-top',
+            'textfield',
+            'thick',
+            'thin',
+            'threeddarkshadow',
+            'threedface',
+            'threedhighlight',
+            'threedlightshadow',
+            'threedshadow',
+            'top',
+            'ultra-condensed',
+            'ultra-expanded',
+            'underline',
+            'unfurl',
+            'up',
+            'upper-alpha',
+            'upper-latin',
+            'upper-roman',
+            'uppercase',
+            'vertical',
+            'visible',
+            'visual',
+            'w-resize',
+            'wait',
+            'wave',
+            'wider',
+            'window',
+            'windowframe',
+            'windowtext',
+            'x-large',
+            'x-small',
+            'xx-large',
+            'xx-small'
+        ),
         // function xxx()
         3 => array(
-            'attr','calc','contrast','cross-fade','cubic-bezier','cycle',
-            'device-cmyk','drop-shadow','element','ellipse','hsl','hsla','hwb',
-            'image','matrix','matrix3d','minmax','gray','grayscale',
-            'perspective','polygon','radial-gradient','translate','translatex',
-            'translatey','translatez','translate3d','skew','skewx','skewy',
-            'saturate','sepia','scale','scalex','scaley','scalez','scale3d',
-            'steps','rect','repeating-linear-gradient',
-            'repeating-radial-gradient','repeat','rgb','rgba','rotate','rotatex',
-            'rotatey','rotatez','rotate3d','url','var'
-            ),
+            'attr',
+            'calc',
+            'contrast',
+            'cross-fade',
+            'cubic-bezier',
+            'cycle',
+            'device-cmyk',
+            'drop-shadow',
+            'ellipse',
+            'hsl',
+            'hsla',
+            'hwb',
+            'image',
+            'matrix',
+            'matrix3d',
+            'minmax',
+            'grayscale',
+            'perspective',
+            'polygon',
+            'radial-gradient',
+            'translate',
+            'translatex',
+            'translatey',
+            'translatez',
+            'translate3d',
+            'skew',
+            'skewx',
+            'skewy',
+            'saturate',
+            'sepia',
+            'scale',
+            'scalex',
+            'scaley',
+            'scalez',
+            'scale3d',
+            'steps',
+            'rect',
+            'repeating-linear-gradient',
+            'repeating-radial-gradient',
+            'rgb',
+            'rgba',
+            'rotate',
+            'rotatex',
+            'rotatey',
+            'rotatez',
+            'rotate3d',
+            'url',
+            'var'
+        ),
         // colors
         4 => array(
-            'aliceblue','antiquewhite','aqua','aquamarine','azure','beige',
-            'bisque','black','blanchedalmond','blue','blueviolet','brown',
-            'burlywood','cadetblue','chartreuse','chocolate','coral',
-            'cornflowerblue','cornsilk','crimson','cyan','darkblue','darkcyan',
-            'darkgoldenrod','darkgray','darkgreen','darkgrey','darkkhaki',
-            'darkmagenta','darkolivegreen','darkorange','darkorchid','darkred',
-            'darksalmon','darkseagreen','darkslateblue','darkslategray',
-            'darkslategrey','darkturquoise','darkviolet','deeppink',
-            'deepskyblue','dimgray','dimgrey','dodgerblue','firebrick',
-            'floralwhite','forestgreen','fuchsia','gainsboro','ghostwhite',
-            'gold','goldenrod','gray','green','greenyellow','grey','honeydew',
-            'hotpink','indianred','indigo','ivory','khaki','lavender',
-            'lavenderblush','lawngreen','lemonchiffon','lightblue','lightcoral',
-            'lightcyan','lightgoldenrodyellow','lightgray','lightgreen',
-            'lightgrey','lightpink','lightsalmon','lightseagreen','lightskyblue',
-            'lightslategray','lightslategrey','lightsteelblue','lightyellow',
-            'lime','limegreen','linen','magenta','maroon','mediumaquamarine',
-            'mediumblue','mediumorchid','mediumpurple','mediumseagreen',
-            'mediumslateblue','mediumspringgreen','mediumturquoise',
-            'mediumvioletred','midnightblue','mintcream','mistyrose','moccasin',
-            'navajowhite','navy','oldlace','olive','olivedrab','orange',
-            'orangered','orchid','palegoldenrod','palegreen','paleturquoise',
-            'palevioletred','papayawhip','peachpuff','peru','pink','plum',
-            'powderblue','purple','rebeccapurple','red','rosybrown','royalblue',
-            'saddlebrown','salmon','sandybrown','seagreen','seashell','sienna',
-            'silver','skyblue','slateblue','slategray','slategrey','snow',
-            'springgreen','steelblue','tan','teal','thistle','transparent',
-            'tomato','turquoise','violet','wheat','white','whitesmoke','yellow',
+            'aliceblue',
+            'antiquewhite',
+            'aqua',
+            'aquamarine',
+            'azure',
+            'beige',
+            'bisque',
+            'black',
+            'blanchedalmond',
+            'blue',
+            'blueviolet',
+            'brown',
+            'burlywood',
+            'cadetblue',
+            'chartreuse',
+            'chocolate',
+            'coral',
+            'cornflowerblue',
+            'cornsilk',
+            'crimson',
+            'cyan',
+            'darkblue',
+            'darkcyan',
+            'darkgoldenrod',
+            'darkgray',
+            'darkgreen',
+            'darkgrey',
+            'darkkhaki',
+            'darkmagenta',
+            'darkolivegreen',
+            'darkorange',
+            'darkorchid',
+            'darkred',
+            'darksalmon',
+            'darkseagreen',
+            'darkslateblue',
+            'darkslategray',
+            'darkslategrey',
+            'darkturquoise',
+            'darkviolet',
+            'deeppink',
+            'deepskyblue',
+            'dimgray',
+            'dimgrey',
+            'dodgerblue',
+            'firebrick',
+            'floralwhite',
+            'forestgreen',
+            'fuchsia',
+            'gainsboro',
+            'ghostwhite',
+            'gold',
+            'goldenrod',
+            'gray',
+            'green',
+            'greenyellow',
+            'grey',
+            'honeydew',
+            'hotpink',
+            'indianred',
+            'indigo',
+            'ivory',
+            'khaki',
+            'lavender',
+            'lavenderblush',
+            'lawngreen',
+            'lemonchiffon',
+            'lightblue',
+            'lightcoral',
+            'lightcyan',
+            'lightgoldenrodyellow',
+            'lightgray',
+            'lightgreen',
+            'lightgrey',
+            'lightpink',
+            'lightsalmon',
+            'lightseagreen',
+            'lightskyblue',
+            'lightslategray',
+            'lightslategrey',
+            'lightsteelblue',
+            'lightyellow',
+            'lime',
+            'limegreen',
+            'linen',
+            'magenta',
+            'maroon',
+            'mediumaquamarine',
+            'mediumblue',
+            'mediumorchid',
+            'mediumpurple',
+            'mediumseagreen',
+            'mediumslateblue',
+            'mediumspringgreen',
+            'mediumturquoise',
+            'mediumvioletred',
+            'midnightblue',
+            'mintcream',
+            'mistyrose',
+            'moccasin',
+            'navajowhite',
+            'navy',
+            'oldlace',
+            'olive',
+            'olivedrab',
+            'orange',
+            'orangered',
+            'orchid',
+            'palegoldenrod',
+            'palegreen',
+            'paleturquoise',
+            'palevioletred',
+            'papayawhip',
+            'peachpuff',
+            'peru',
+            'pink',
+            'plum',
+            'powderblue',
+            'purple',
+            'rebeccapurple',
+            'red',
+            'rosybrown',
+            'royalblue',
+            'saddlebrown',
+            'salmon',
+            'sandybrown',
+            'seagreen',
+            'seashell',
+            'sienna',
+            'silver',
+            'skyblue',
+            'slateblue',
+            'slategray',
+            'slategrey',
+            'snow',
+            'springgreen',
+            'steelblue',
+            'tan',
+            'teal',
+            'thistle',
+            'transparent',
+            'tomato',
+            'turquoise',
+            'violet',
+            'wheat',
+            'white',
+            'whitesmoke',
+            'yellow',
             'yellowgreen'
-            ),
+        ),
         // pseudo class
         5 => array(
-            'active','after','before','checked','choices','default','dir',
-            'disabled','empty','enabled','first','first-child','first-letter',
-            'first-line','first-of-type','focus','fullscreen','hover',
-            'indeterminate','in-range','invalid','lang','last-child',
-            'last-of-type','left','link','not','nth-child','nth-last-child',
-            'nth-last-of-type','nth-of-type','only-child','only-of-type',
-            'optional','out-of-range','read-only','read-write','repeat-index',
-            'repeat-item','required','right','root','scope','selection','target',
-            'valid','value','visited'
-            )
-        ),
+            'active',
+            'after',
+            'before',
+            'checked',
+            'choices',
+            'dir',
+            'disabled',
+            'empty',
+            'enabled',
+            'first',
+            'first-child',
+            'first-letter',
+            'first-line',
+            'first-of-type',
+            'focus',
+            'fullscreen',
+            'hover',
+            'indeterminate',
+            'in-range',
+            'invalid',
+            'lang',
+            'last-child',
+            'last-of-type',
+            'link',
+            'not',
+            'nth-child',
+            'nth-last-child',
+            'nth-last-of-type',
+            'nth-of-type',
+            'only-child',
+            'only-of-type',
+            'optional',
+            'out-of-range',
+            'repeat-index',
+            'repeat-item',
+            'required',
+            'root',
+            'scope',
+            'selection',
+            'target',
+            'valid',
+            'value',
+            'visited'
+        )
+    ),
     'SYMBOLS' => array(
         '(', ')', '{', '}', ':', ';',
         '>', '+', '*', ',', '^', '='
-        ),
+    ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
         1 => true,
@@ -265,7 +866,7 @@ $language_data = array (
         3 => true,
         4 => true,
         5 => true
-        ),
+    ),
     'STYLES' => array(
         'KEYWORDS' => array(
             1 => 'color: #000000; font-weight: bold;',
@@ -273,52 +874,48 @@ $language_data = array (
             3 => 'color: #9932cc;',
             4 => 'color: #dc143c;',
             5 => 'color: #F5758F;',
-            ),
+        ),
         'COMMENTS' => array(
-            1 => 'color: #a1a100;',
             2 => 'color: #ff0000; font-style: italic;',
             'MULTI' => 'color: #808080; font-style: italic;'
-            ),
+        ),
         'ESCAPE_CHAR' => array(
             0 => 'color: #000099; font-weight: bold;',
             //1 => 'color: #000099; font-weight: bold;',
             2 => 'color: #000099; font-weight: bold;'
             //3 => 'color: #000099; font-weight: bold;'
-            ),
+        ),
         'BRACKETS' => array(
             0 => 'color: #00AA00;'
-            ),
+        ),
         'STRINGS' => array(
             0 => 'color: #ff0000;'
-            ),
+        ),
         'NUMBERS' => array(
             0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
+        ),
+        'METHODS' => array(),
         'SYMBOLS' => array(
             0 => 'color: #00AA00;'
-            ),
-        'SCRIPT' => array(
-            ),
+        ),
+        'SCRIPT' => array(),
         'REGEXPS' => array(
             0 => 'color: #cc00cc;',
             1 => 'color: #6666ff;',
             2 => 'color: #3F84D9; font-weight: bold;',
             3 => 'color: #933;',
             4 => 'color: #444;'
-            )
-        ),
+        )
+    ),
     'URLS' => array(
         1 => '',
         2 => '',
         3 => '',
         4 => '',
         5 => ''
-        ),
+    ),
     'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
+    'OBJECT_SPLITTERS' => array(),
     'REGEXPS' => array(
         //DOM Node ID
         0 => '\#[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*',
@@ -330,17 +927,18 @@ $language_data = array (
         3 => '[+\-]?(\d+|(\d*\.\d+))(em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx|%)',
         //var
         4 => '(--[a-zA-Z0-9\-]*)'
-        ),
+    ),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
     'TAB_WIDTH' => 4,
     'PARSER_CONTROL' => array(
         'KEYWORDS' => array(
             'DISALLOWED_AFTER' => '(?![\-a-zA-Z0-9_\|%\\-&\.])',
-            'DISALLOWED_BEFORE' => '(?<![\-a-zA-Z0-9_\|%\\~&\.])'
+            'DISALLOWED_BEFORE' => '(?<![\-a-zA-Z0-9_\|%\\~&\.])',
+            1 => array(
+                'DISALLOWED_AFTER' => '(?![\-a-zA-Z0-9_\|%\\-&\.])(?=\s*:)'
+            )
         )
     )
 );
diff --git a/htdocs/application/libraries/geshi/geshi/cuesheet.php b/htdocs/application/libraries/geshi/geshi/cuesheet.php
index 675264d..97d631c 100644
--- a/htdocs/application/libraries/geshi/geshi/cuesheet.php
+++ b/htdocs/application/libraries/geshi/geshi/cuesheet.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Benny Baumann (benbe@geshi.org)
  * Copyright: (c) 2009 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/12/21
  *
  * Cuesheet language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/d.php b/htdocs/application/libraries/geshi/geshi/d.php
index eb68ea5..5e3713a 100644
--- a/htdocs/application/libraries/geshi/geshi/d.php
+++ b/htdocs/application/libraries/geshi/geshi/d.php
@@ -6,7 +6,7 @@
  * Contributors:
  *  - Jimmy Cao
  * Copyright: (c) 2005 Thomas Kuehne (http://thomas.kuehne.cn/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/04/22
  *
  * D language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/dart.php b/htdocs/application/libraries/geshi/geshi/dart.php
index 932e13e..83c00c9 100644
--- a/htdocs/application/libraries/geshi/geshi/dart.php
+++ b/htdocs/application/libraries/geshi/geshi/dart.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Edward Hart (edward.dan.hart@gmail.com)
  * Copyright: (c) 2013 Edward Hart
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2013/10/25
  *
  * Dart language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/dcl.php b/htdocs/application/libraries/geshi/geshi/dcl.php
index 90de873..a1489c7 100644
--- a/htdocs/application/libraries/geshi/geshi/dcl.php
+++ b/htdocs/application/libraries/geshi/geshi/dcl.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Petr Hendl (petr@hendl.cz)
  * Copyright: (c) 2011 Petr Hendl http://hendl.cz/geshi/
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/02/17
  *
  * DCL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/dcpu16.php b/htdocs/application/libraries/geshi/geshi/dcpu16.php
index 4dec5a8..8c61bff 100644
--- a/htdocs/application/libraries/geshi/geshi/dcpu16.php
+++ b/htdocs/application/libraries/geshi/geshi/dcpu16.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2007-2014 Benny Baumann (http://geshi.org/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/04/12
  *
  * DCPU/16 Assembly language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/dcs.php b/htdocs/application/libraries/geshi/geshi/dcs.php
index 99fa628..58bf5a0 100644
--- a/htdocs/application/libraries/geshi/geshi/dcs.php
+++ b/htdocs/application/libraries/geshi/geshi/dcs.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Stelio Passaris (GeSHi@stelio.net)
  * Copyright: (c) 2009 Stelio Passaris (http://stelio.net/stiki/GeSHi)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/01/20
  *
  * DCS language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/delphi.php b/htdocs/application/libraries/geshi/geshi/delphi.php
index a0cd36e..fadb4ad 100644
--- a/htdocs/application/libraries/geshi/geshi/delphi.php
+++ b/htdocs/application/libraries/geshi/geshi/delphi.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: J�rja Norbert (jnorbi@vipmail.hu), Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2004 J�rja Norbert, Benny Baumann (BenBE@omorphia.de), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/26
  *
  * Delphi (Object Pascal) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/diff.php b/htdocs/application/libraries/geshi/geshi/diff.php
index e4bfc6f..ee01e0c 100644
--- a/htdocs/application/libraries/geshi/geshi/diff.php
+++ b/htdocs/application/libraries/geshi/geshi/diff.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Conny Brunnkvist (conny@fuchsia.se), W. Tasin (tasin@fhm.edu)
  * Copyright: (c) 2004 Fuchsia Open Source Solutions (http://www.fuchsia.se/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/12/29
  *
  * Diff-output language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/div.php b/htdocs/application/libraries/geshi/geshi/div.php
index 8b230da..6ae99f1 100644
--- a/htdocs/application/libraries/geshi/geshi/div.php
+++ b/htdocs/application/libraries/geshi/geshi/div.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Gabriel Lorenzo (ermakina@gmail.com)
  * Copyright: (c) 2005 Gabriel Lorenzo (http://ermakina.gazpachito.net)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/06/19
  *
  * DIV language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/dos.php b/htdocs/application/libraries/geshi/geshi/dos.php
index 080f300..744cb82 100644
--- a/htdocs/application/libraries/geshi/geshi/dos.php
+++ b/htdocs/application/libraries/geshi/geshi/dos.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Alessandro Staltari (staltari@geocities.com)
  * Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/07/05
  *
  * DOS language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/dot.php b/htdocs/application/libraries/geshi/geshi/dot.php
index 430ea24..77de029 100644
--- a/htdocs/application/libraries/geshi/geshi/dot.php
+++ b/htdocs/application/libraries/geshi/geshi/dot.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Adrien Friggeri (adrien@friggeri.net)
  * Copyright: (c) 2007 Adrien Friggeri (http://www.friggeri.net)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/05/30
  *
  * dot language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/e.php b/htdocs/application/libraries/geshi/geshi/e.php
index 4d4c539..5f321e6 100644
--- a/htdocs/application/libraries/geshi/geshi/e.php
+++ b/htdocs/application/libraries/geshi/geshi/e.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Kevin Reid (kpreid@switchb.org)
  * Copyright: (c) 2010 Kevin Reid (http://switchb.org/kpreid/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/04/16
  *
  * E language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ecmascript.php b/htdocs/application/libraries/geshi/geshi/ecmascript.php
index 7a1da92..8d4ab15 100644
--- a/htdocs/application/libraries/geshi/geshi/ecmascript.php
+++ b/htdocs/application/libraries/geshi/geshi/ecmascript.php
@@ -4,7 +4,7 @@
  * --------------
  * Author: Michel Mariani (http://www.tonton-pixel.com/site/)
  * Copyright: (c) 2010 Michel Mariani (http://www.tonton-pixel.com/site/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/01/08
  *
  * ECMAScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/eiffel.php b/htdocs/application/libraries/geshi/geshi/eiffel.php
index 5142e79..14a2cc0 100644
--- a/htdocs/application/libraries/geshi/geshi/eiffel.php
+++ b/htdocs/application/libraries/geshi/geshi/eiffel.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Zoran Simic (zsimic@axarosenberg.com)
  * Copyright: (c) 2005 Zoran Simic
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/06/30
  *
  * Eiffel language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/email.php b/htdocs/application/libraries/geshi/geshi/email.php
index 4ddc6ab..c77d0fa 100644
--- a/htdocs/application/libraries/geshi/geshi/email.php
+++ b/htdocs/application/libraries/geshi/geshi/email.php
@@ -4,7 +4,7 @@
  * ---------------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/10/19
  *
  * Email (mbox \ eml \ RFC format) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/epc.php b/htdocs/application/libraries/geshi/geshi/epc.php
index 2db41fe..b3ea4ae 100644
--- a/htdocs/application/libraries/geshi/geshi/epc.php
+++ b/htdocs/application/libraries/geshi/geshi/epc.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Thorsten Muehlfelder (muehlfelder@enertex.de)
  * Copyright: (c) 2010 Enertex Bayern GmbH
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/08/26
  *
  * Enerscript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/erlang.php b/htdocs/application/libraries/geshi/geshi/erlang.php
index 9939d1a..a153832 100644
--- a/htdocs/application/libraries/geshi/geshi/erlang.php
+++ b/htdocs/application/libraries/geshi/geshi/erlang.php
@@ -7,7 +7,7 @@
  * - Uwe Dauernheim (uwe@dauernheim.net)
  * - Dan Forest-Barbier (dan@twisted.in)
  * Copyright: (c) 2008 Uwe Dauernheim (http://www.kreisquadratur.de/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008-09-27
  *
  * Erlang language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/euphoria.php b/htdocs/application/libraries/geshi/geshi/euphoria.php
index 1989755..5888d0f 100644
--- a/htdocs/application/libraries/geshi/geshi/euphoria.php
+++ b/htdocs/application/libraries/geshi/geshi/euphoria.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Nicholas Koceja (nerketur@hotmail.com)
  * Copyright: (c) 2010 Nicholas Koceja
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 11/24/2010
  *
  * Euphoria language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ezt.php b/htdocs/application/libraries/geshi/geshi/ezt.php
index 196a56b..5052412 100644
--- a/htdocs/application/libraries/geshi/geshi/ezt.php
+++ b/htdocs/application/libraries/geshi/geshi/ezt.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Ramesh Vishveshwar (ramesh.vishveshwar@gmail.com)
  * Copyright: (c) 2012 Ramesh Vishveshwar (http://thecodeisclear.in)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/09/01
  *
  * Easytrieve language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/f1.php b/htdocs/application/libraries/geshi/geshi/f1.php
index 75a7cd5..1203e1b 100644
--- a/htdocs/application/libraries/geshi/geshi/f1.php
+++ b/htdocs/application/libraries/geshi/geshi/f1.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Juro Bystricky (juro@f1compiler.com)
  * Copyright: K2 Software Corp.
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/07/06
  *
  * Formula One language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/falcon.php b/htdocs/application/libraries/geshi/geshi/falcon.php
index aeb4133..ad5f3a6 100644
--- a/htdocs/application/libraries/geshi/geshi/falcon.php
+++ b/htdocs/application/libraries/geshi/geshi/falcon.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: billykater (billykater+geshi@gmail.com)
  * Copyright: (c) 2010 billykater (http://falconpl.org/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/06/07
  *
  * Falcon language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/fo.php b/htdocs/application/libraries/geshi/geshi/fo.php
index 661f5bb..8628bb1 100644
--- a/htdocs/application/libraries/geshi/geshi/fo.php
+++ b/htdocs/application/libraries/geshi/geshi/fo.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Tan-Vinh Nguyen (tvnguyen@web.de)
  * Copyright: (c) 2009 Tan-Vinh Nguyen
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/03/23
  *
  * fo language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/fortran.php b/htdocs/application/libraries/geshi/geshi/fortran.php
index c3bd402..e463cb9 100644
--- a/htdocs/application/libraries/geshi/geshi/fortran.php
+++ b/htdocs/application/libraries/geshi/geshi/fortran.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Cedric Arrabie (cedric.arrabie@univ-pau.fr)
  * Copyright: (C) 2006 Cetric Arrabie
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/04/22
  *
  * Fortran language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/freebasic.php b/htdocs/application/libraries/geshi/geshi/freebasic.php
index 842a805..cc6bd7b 100644
--- a/htdocs/application/libraries/geshi/geshi/freebasic.php
+++ b/htdocs/application/libraries/geshi/geshi/freebasic.php
@@ -4,7 +4,7 @@
  * -------------
  * Author: Roberto Rossi
  * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/08/19
  *
  * FreeBasic (http://www.freebasic.net/) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/freeswitch.php b/htdocs/application/libraries/geshi/geshi/freeswitch.php
index efecedd..14f2b93 100644
--- a/htdocs/application/libraries/geshi/geshi/freeswitch.php
+++ b/htdocs/application/libraries/geshi/geshi/freeswitch.php
@@ -4,7 +4,7 @@
  * --------
  * Author: James Rose (james.gs@stubbornroses.com)
  * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/11/18
  *
  * FreeSWITCH language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/fsharp.php b/htdocs/application/libraries/geshi/geshi/fsharp.php
index 33aa122..5fc9878 100644
--- a/htdocs/application/libraries/geshi/geshi/fsharp.php
+++ b/htdocs/application/libraries/geshi/geshi/fsharp.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: julien ortin (jo_spam-divers@yahoo.fr)
  * Copyright: (c) 2009 julien ortin
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/09/20
  *
  * F# language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/gambas.php b/htdocs/application/libraries/geshi/geshi/gambas.php
index 4bb582e..8510b86 100644
--- a/htdocs/application/libraries/geshi/geshi/gambas.php
+++ b/htdocs/application/libraries/geshi/geshi/gambas.php
@@ -5,7 +5,7 @@
  * Author: Jesus Guardon (jguardon@telefonica.net)
  * Copyright: (c) 2009 Jesus Guardon (http://gambas-es.org),
  *                     Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/20
  *
  * GAMBAS language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/gdb.php b/htdocs/application/libraries/geshi/geshi/gdb.php
index 16cc9fb..d05a9ca 100644
--- a/htdocs/application/libraries/geshi/geshi/gdb.php
+++ b/htdocs/application/libraries/geshi/geshi/gdb.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2009 Milian Wolff
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/06/24
  *
  * GDB language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/genero.php b/htdocs/application/libraries/geshi/geshi/genero.php
index faac5e8..4d3cc36 100644
--- a/htdocs/application/libraries/geshi/geshi/genero.php
+++ b/htdocs/application/libraries/geshi/geshi/genero.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Lars Gersmann (lars.gersmann@gmail.com)
  * Copyright: (c) 2007 Lars Gersmann, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/07/01
  *
  * Genero (FOURJ's Genero 4GL) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/genie.php b/htdocs/application/libraries/geshi/geshi/genie.php
index 3849562..dabc389 100644
--- a/htdocs/application/libraries/geshi/geshi/genie.php
+++ b/htdocs/application/libraries/geshi/geshi/genie.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Nicolas Joseph (nicolas.joseph@valaide.org)
  * Copyright: (c) 2009 Nicolas Joseph
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/04/29
  *
  * Genie language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/gettext.php b/htdocs/application/libraries/geshi/geshi/gettext.php
index ef4dd96..871f5ae 100644
--- a/htdocs/application/libraries/geshi/geshi/gettext.php
+++ b/htdocs/application/libraries/geshi/geshi/gettext.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2008 Milian Wolff
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/05/25
  *
  * GNU Gettext .po/.pot language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/glsl.php b/htdocs/application/libraries/geshi/geshi/glsl.php
index 1eb3918..d67adb2 100644
--- a/htdocs/application/libraries/geshi/geshi/glsl.php
+++ b/htdocs/application/libraries/geshi/geshi/glsl.php
@@ -4,7 +4,7 @@
  * -----
  * Author: Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2008 Benny Baumann (BenBE@omorphia.de)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/03/20
  *
  * glSlang language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/gml.php b/htdocs/application/libraries/geshi/geshi/gml.php
index 26c913b..2cb0cd2 100644
--- a/htdocs/application/libraries/geshi/geshi/gml.php
+++ b/htdocs/application/libraries/geshi/geshi/gml.php
@@ -4,7 +4,7 @@
  * -------
  * Author: José Jorge Enríquez <jenriquez@users.sourceforge.net>, Timon Knigge <timonknigge@live.nl>
  * Copyright: (c) 2005 José Jorge Enríquez Rodríguez (http://www.zonamakers.com), (c) 2013 Timon Knigge (http://www.bluemoonproductions.nl)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/06/21
  *
  * GML language file for GeSHi.
@@ -183,7 +183,7 @@ $language_data = array(
             'move_outside_solid','move_random','move_snap','move_towards_point','move_wrap','mp_grid_add_cell','mp_grid_add_instances','mp_grid_add_rectangle','mp_grid_clear_all','mp_grid_clear_cell',
             'mp_grid_clear_rectangle','mp_grid_create','mp_grid_destroy','mp_grid_draw','mp_grid_path','mp_linear_path','mp_linear_path_object','mp_linear_step','mp_linear_step_object','mp_potential_path',
             'mp_potential_path_object','mp_potential_settings','mp_potential_step','mp_potential_step_object','network_connect','network_connect_raw','network_create_server','network_create_socket','network_destroy',
-            'network_destroy','network_resolve','network_send_broadcast','network_send_packet','network_send_raw','network_send_udp','network_set_timeout','object_exists','object_get_depth','object_get_mask',
+            'network_resolve','network_send_broadcast','network_send_packet','network_send_raw','network_send_udp','network_set_timeout','object_exists','object_get_depth','object_get_mask',
             'object_get_name','object_get_parent','object_get_persistent','object_get_physics','object_get_solid','object_get_sprite','object_get_visible','object_is_ancestor','object_set_depth','object_set_mask',
             'object_set_persistent','object_set_solid','object_set_sprite','object_set_visible','ord','os_get_config','os_get_info','os_get_language','os_is_network_connected','os_is_paused','os_lock_orientation',
             'os_powersave_enable','parameter_count','parameter_string','part_emitter_burst','part_emitter_clear','part_emitter_create','part_emitter_destroy','part_emitter_destroy_all','part_emitter_exists',
@@ -207,7 +207,7 @@ $language_data = array(
             'room_instance_clear','room_next','room_previous','room_restart','room_set_background','room_set_background_color','room_set_height','room_set_persistent','room_set_view','room_set_view_enabled','room_set_width',
             'room_tile_add','room_tile_add_ext','room_tile_clear','round','screen_save','screen_save_part','script_execute','script_exists','script_get_name','sha1_file','sha1_string_unicode','sha1_string_utf8','shader_enable_corner_id',
             'shader_get_sampler_index','shader_get_uniform','shader_is_compiled','shader_reset','shader_set','shader_set_uniform_f','shader_set_uniform_f_array','shader_set_uniform_i','shader_set_uniform_i_array',
-            'shader_set_uniform_matrix','shader_set_uniform_matrix_array','shaders_are_supported','shop_leave_rating','show_debug_message','show_debug_overlay','show_error','show_message','show_message','show_message_async',
+            'shader_set_uniform_matrix','shader_set_uniform_matrix_array','shaders_are_supported','shop_leave_rating','show_debug_message','show_debug_overlay','show_error','show_message','show_message_async',
             'show_question','show_question_async','sign','sin','sound_add','sound_delete','sound_exists','sound_fade','sound_get_name','sound_global_volume','sound_isplaying','sound_loop','sound_play','sound_replace',
             'sound_stop','sound_stop_all','sound_volume','sprite_add','sprite_add_from_surface','sprite_assign','sprite_collision_mask','sprite_create_from_surface','sprite_delete','sprite_duplicate','sprite_exists',
             'sprite_get_bbox_bottom','sprite_get_bbox_left','sprite_get_bbox_right','sprite_get_bbox_top','sprite_get_height','sprite_get_name','sprite_get_number','sprite_get_texture','sprite_get_tpe','sprite_get_uvs',
@@ -292,8 +292,8 @@ $language_data = array(
         // Keywords
         4 => array(
             'if','while','do','until','exit','break','continue','for','switch','case','default',
-            'else','then','begin','end','repeat','switch','var','globalvar','with','div','mod',
-            'self','noone','other','all','global','local','return',
+            'else','then','begin','end','repeat','var','globalvar','with','div','mod',
+            'self','noone','other','global','local','return',
             'and','or','xor','not'
             )
         ),
diff --git a/htdocs/application/libraries/geshi/geshi/gnuplot.php b/htdocs/application/libraries/geshi/geshi/gnuplot.php
index 27a2a63..55e1055 100644
--- a/htdocs/application/libraries/geshi/geshi/gnuplot.php
+++ b/htdocs/application/libraries/geshi/geshi/gnuplot.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/07/07
  *
  * Gnuplot script language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/go.php b/htdocs/application/libraries/geshi/geshi/go.php
index 7f1b825..5c9212b 100644
--- a/htdocs/application/libraries/geshi/geshi/go.php
+++ b/htdocs/application/libraries/geshi/geshi/go.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Markus Jarderot (mizardx at gmail dot com)
  * Copyright: (c) 2010 Markus Jarderot
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/05/20
  *
  * Go language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/groovy.php b/htdocs/application/libraries/geshi/geshi/groovy.php
index 37fc817..9f201bb 100644
--- a/htdocs/application/libraries/geshi/geshi/groovy.php
+++ b/htdocs/application/libraries/geshi/geshi/groovy.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Ivan F. Villanueva B. (geshi_groovy@artificialidea.com)
  * Copyright: (c) 2006 Ivan F. Villanueva B.(http://www.artificialidea.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/04/29
  *
  * Groovy language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/gwbasic.php b/htdocs/application/libraries/geshi/geshi/gwbasic.php
index 97310df..9bf2c15 100644
--- a/htdocs/application/libraries/geshi/geshi/gwbasic.php
+++ b/htdocs/application/libraries/geshi/geshi/gwbasic.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: José Gabriel Moya Yangüela (josemoya@gmail.com)
  * Copyright: (c) 2010 José Gabriel Moya Yangüela (http://doc.apagada.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/01/30
  *
  * GwBasic language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/haskell.php b/htdocs/application/libraries/geshi/geshi/haskell.php
index 848dd1d..7b7c904 100644
--- a/htdocs/application/libraries/geshi/geshi/haskell.php
+++ b/htdocs/application/libraries/geshi/geshi/haskell.php
@@ -6,7 +6,7 @@
  *         Based on haskell.php by Jason Dagit (dagit@codersbase.com), which was
  *         based on ocaml.php by Flaie (fireflaie@gmail.com).
  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2014/05/12
  *
  * Haskell language file for GeSHi.
@@ -40,7 +40,7 @@ $language_data = array (
         3 => "/{-(?:(?R)|.)-}/s", //Nested Comments
         ),
     'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array('"',"'"),
+    'QUOTEMARKS' => array('"'),
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         /* main haskell keywords */
@@ -152,7 +152,7 @@ $language_data = array (
             0 => 'color: green;'
             ),
         'STRINGS' => array(
-            0 => 'background-color: #3cb371;' /* nice green */
+            0 => 'color: #3cb371;' /* nice green */
             ),
         'NUMBERS' => array(
             0 => 'color: red;' /* pink */
diff --git a/htdocs/application/libraries/geshi/geshi/haxe.php b/htdocs/application/libraries/geshi/geshi/haxe.php
index 17f8394..c9376bd 100644
--- a/htdocs/application/libraries/geshi/geshi/haxe.php
+++ b/htdocs/application/libraries/geshi/geshi/haxe.php
@@ -6,7 +6,7 @@
  *         John Liao (colorhook@gmail.com)
  * Copyright: (c) 2012 onthewings (http://www.onthewings.net/)
  *                2010 colorhook (http://colorhook.com/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/10/05
  *
  * Haxe language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/hicest.php b/htdocs/application/libraries/geshi/geshi/hicest.php
index cc2c017..b8639bb 100644
--- a/htdocs/application/libraries/geshi/geshi/hicest.php
+++ b/htdocs/application/libraries/geshi/geshi/hicest.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Georg Petrich (spt@hicest.com)
  * Copyright: (c) 2010 Georg Petrich (http://www.HicEst.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/03/15
  *
  * HicEst language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/hq9plus.php b/htdocs/application/libraries/geshi/geshi/hq9plus.php
index bb461b1..843f2d6 100644
--- a/htdocs/application/libraries/geshi/geshi/hq9plus.php
+++ b/htdocs/application/libraries/geshi/geshi/hq9plus.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/10/31
  *
  * HQ9+ language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/html4strict.php b/htdocs/application/libraries/geshi/geshi/html4strict.php
index 1f01f68..42ff9c7 100644
--- a/htdocs/application/libraries/geshi/geshi/html4strict.php
+++ b/htdocs/application/libraries/geshi/geshi/html4strict.php
@@ -4,7 +4,7 @@
  * ---------------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/10
  *
  * HTML 4.01 strict language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/html5.php b/htdocs/application/libraries/geshi/geshi/html5.php
index 04fb820..25d33cb 100644
--- a/htdocs/application/libraries/geshi/geshi/html5.php
+++ b/htdocs/application/libraries/geshi/geshi/html5.php
@@ -4,7 +4,7 @@
  * ---------------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/10
  *
  * HTML 5 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/icon.php b/htdocs/application/libraries/geshi/geshi/icon.php
index eddc88b..1022690 100644
--- a/htdocs/application/libraries/geshi/geshi/icon.php
+++ b/htdocs/application/libraries/geshi/geshi/icon.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Matt Oates (mattoates@gmail.com)
  * Copyright: (c) 2010 Matt Oates (http://mattoates.co.uk)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/04/24
  *
  * Icon language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/idl.php b/htdocs/application/libraries/geshi/geshi/idl.php
index 0bdeb9c..f960f8b 100644
--- a/htdocs/application/libraries/geshi/geshi/idl.php
+++ b/htdocs/application/libraries/geshi/geshi/idl.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Cedric Bosdonnat (cedricbosdo@openoffice.org)
  * Copyright: (c) 2006 Cedric Bosdonnat
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/08/20
  *
  * Unoidl language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ini.php b/htdocs/application/libraries/geshi/geshi/ini.php
index 914ebdf..fe04224 100644
--- a/htdocs/application/libraries/geshi/geshi/ini.php
+++ b/htdocs/application/libraries/geshi/geshi/ini.php
@@ -4,7 +4,7 @@
  * --------
  * Author: deguix (cevo_deguix@yahoo.com.br)
  * Copyright: (c) 2005 deguix
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/03/27
  *
  * INI language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/inno.php b/htdocs/application/libraries/geshi/geshi/inno.php
index 5fde614..542719c 100644
--- a/htdocs/application/libraries/geshi/geshi/inno.php
+++ b/htdocs/application/libraries/geshi/geshi/inno.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Thomas Klingler (hotline@theratech.de) based on delphi.php from J�rja Norbert (jnorbi@vipmail.hu)
  * Copyright: (c) 2004 J�rja Norbert, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/07/29
  *
  * Inno Script language inkl. Delphi (Object Pascal) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/intercal.php b/htdocs/application/libraries/geshi/geshi/intercal.php
index c68b979..669050a 100644
--- a/htdocs/application/libraries/geshi/geshi/intercal.php
+++ b/htdocs/application/libraries/geshi/geshi/intercal.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/10/31
  *
  * INTERCAL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/io.php b/htdocs/application/libraries/geshi/geshi/io.php
index b57ab85..5c8b93f 100644
--- a/htdocs/application/libraries/geshi/geshi/io.php
+++ b/htdocs/application/libraries/geshi/geshi/io.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2006 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/09/23
  *
  * Io language file for GeSHi. Thanks to Johnathan Wright for the suggestion and help
diff --git a/htdocs/application/libraries/geshi/geshi/ispfpanel.php b/htdocs/application/libraries/geshi/geshi/ispfpanel.php
index a0b0541..8e60eed 100644
--- a/htdocs/application/libraries/geshi/geshi/ispfpanel.php
+++ b/htdocs/application/libraries/geshi/geshi/ispfpanel.php
@@ -4,7 +4,7 @@
  * -------------
  * Author: Ramesh Vishveshwar (ramesh.vishveshwar@gmail.com)
  * Copyright: (c) 2012 Ramesh Vishveshwar (http://thecodeisclear.in)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/09/18
  *
  * ISPF Panel Definition (MVS) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/j.php b/htdocs/application/libraries/geshi/geshi/j.php
index 4cfda8b..499c489 100644
--- a/htdocs/application/libraries/geshi/geshi/j.php
+++ b/htdocs/application/libraries/geshi/geshi/j.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Ric Sherlock (tikkanz@gmail.com)
  * Copyright: (c) 2009 Ric Sherlock
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/11/10
  *
  * J language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/java.php b/htdocs/application/libraries/geshi/geshi/java.php
index b7323cd..59733b5 100644
--- a/htdocs/application/libraries/geshi/geshi/java.php
+++ b/htdocs/application/libraries/geshi/geshi/java.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/10
  *
  * Java language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/java5.php b/htdocs/application/libraries/geshi/geshi/java5.php
index 8f0d670..f9dbf31 100644
--- a/htdocs/application/libraries/geshi/geshi/java5.php
+++ b/htdocs/application/libraries/geshi/geshi/java5.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/10
  *
  * Java language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/javascript.php b/htdocs/application/libraries/geshi/geshi/javascript.php
index 439b7a9..bc13dc4 100644
--- a/htdocs/application/libraries/geshi/geshi/javascript.php
+++ b/htdocs/application/libraries/geshi/geshi/javascript.php
@@ -4,7 +4,7 @@
  * --------------
  * Author: Ben Keen (ben.keen@gmail.com)
  * Copyright: (c) 2004 Ben Keen (ben.keen@gmail.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/20
  *
  * JavaScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/jcl.php b/htdocs/application/libraries/geshi/geshi/jcl.php
index 74fe0fd..07e3b50 100644
--- a/htdocs/application/libraries/geshi/geshi/jcl.php
+++ b/htdocs/application/libraries/geshi/geshi/jcl.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Ramesh Vishveshwar (ramesh.vishveshwar@gmail.com)
  * Copyright: (c) 2012 Ramesh Vishveshwar (http://thecodeisclear.in)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/09/16
  *
  * JCL (MVS), DFSORT, IDCAMS language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/jquery.php b/htdocs/application/libraries/geshi/geshi/jquery.php
index 02a9eee..0ffd83f 100644
--- a/htdocs/application/libraries/geshi/geshi/jquery.php
+++ b/htdocs/application/libraries/geshi/geshi/jquery.php
@@ -4,7 +4,7 @@
  * --------------
  * Author: Rob Loach (http://www.robloach.net)
  * Copyright: (c) 2009 Rob Loach (http://www.robloach.net)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/07/20
  *
  * jQuery 1.3 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/julia.php b/htdocs/application/libraries/geshi/geshi/julia.php
new file mode 100644
index 0000000..93459c5
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/julia.php
@@ -0,0 +1,171 @@
+<?php
+/*************************************************************************************
+ * julia.php
+ * -----------
+ * Author: John Lynch (john.lynch@iname.com)
+ * Contributors:
+ *   - Magnus Lie Hetland
+ *   - Curtis Vogt
+ * Copyright: (c) 2013 John Lynch
+ * Release Version: 1.0.9.0
+ * Date Started: 2013/11/06
+ *
+ * Julia language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * 2015/11/04
+ *   -  First Release submitted
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Julia',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    //Longest quotemarks ALWAYS first
+    'QUOTEMARKS' => array('"""', '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+
+        /*
+        ** reserved words
+        */
+        1 => array(
+            'function', 'global', 'for', 'end', 'while', 'if', 'else', 'elseif', 'break',
+            'switch', 'case', 'otherwise', 'try', 'catch', 'const', 'immutable',
+            'import', 'importall', 'export', 'type', 'typealias', 'return', 'true',
+            'false', 'macro', 'quote', 'in', 'abstract', 'module', 'using', 'continue',
+            'ifelse', 'do', 'eval', 'let', 'finally', 'throw'
+        ),
+
+        /*
+        ** builtins
+        */
+        2 => array(
+            'Array', 'String', 'Bool', 'Number', 'Int', 'Integer', 'Real', 'Complex',
+            'FloatingPoint', 'Float64', 'Float32', 'Int8', 'Int16', 'Int32', 'Int64',
+            'Rational', 'AbstractArray', 'Unsigned', 'Signed', 'Uint', 'Uint8', 'Uint16',
+            'Uint32', 'Uint64', 'Vector', 'AbstractVector', 'Matrix', 'AbstractMatrix',
+            'Type', 'IO', 'Any', 'ASCIIString', 'Union', 'Dict', 'Function', 'SubArray',
+            'Range', 'Range1', 'Symbol', 'Expr',
+
+            'cell', 'collect', 'filter', 'merge', 'divrem', 'hex', 'dec', 'oct', 'base',
+            'int', 'round', 'cmp', 'float', 'linspace', 'fill', 'start', 'done', 'tuple',
+            'minimum', 'maximum', 'count', 'index', 'append', 'push', 'pop', 'shift',
+            'unshift', 'insert', 'splice', 'reverse', 'sort', 'zip', 'length', 'delete',
+            'copy', 'haskey', 'keys', 'values', 'get', 'getkey', 'Set', 'isa', 'issubset',
+            'intersect', 'setdiff', 'symdiff', 'complement', 'print', 'printf', 'println',
+            'sprintf', 'utf8', 'char', 'search', 'rsearch',
+            'replace', 'lowercase', 'uppercase', 'ucfirst', 'lcfirst', 'union',
+            'split', 'rsplit', 'chop', 'chomp', 'lpad', 'rpad', 'lstrip', 'rstrip',
+            'strip', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl', 'isdigit',
+            'isgraph', 'islower', 'isprint', 'ispunct', 'isspace', 'isupper', 'isxdigit',
+            'match', 'captures', 'offset', 'offsets', 'matchall', 'eachmatch', 'hcat',
+            'vcat', 'hvcat', 'reshape', 'deepcopy', 'similar', 'reinterpret', 'map',
+            'reduce', 'mapreduce', 'DataArray', 'DataFrame', 'removeNA', 'replaceNA',
+            'colnames', 'head', 'tail', 'describe', 'join', 'groupby', 'by', 'stack',
+            'readtable', 'readcsv', 'readdlm', 'writetable', 'writecsv', 'writedlm',
+            'require', 'reload', 'include', 'evalfile', 'cd', 'open', 'write', 'close',
+            'position', 'seek', 'seekstart', 'skip', 'isopen', 'eof',
+            'isreadonly', 'ltoh', 'htol', 'serialize', 'deserialize', 'download',
+            'isequal', 'getindex', 'setindex', 'eachline', 'beginswith', 'endswith',
+            'parsefloat', 'parseint', 'seekend', 'findnz', 'DivideError', 'addprocs',
+            'scale', 'issubnormal', 'readdir', 'mapslices'
+        ),
+
+        /*
+        ** system interaction
+        */
+        3 => array(
+            'run', 'spawn', 'success', 'process_running', 'process_exited', 'kill',
+            'readsfrom', 'writesto', 'readsandwrite', 'detach', 'setenv', 'ENV', 'getpid',
+            'clipboard', 'strftime', 'time', 'gethostname', 'getipaddr', 'pwd',
+            'mkdir', 'mkpath', 'rmdir', 'ignorestatus'
+        ),
+
+        /*
+        ** prompt
+        */
+        4 => array(
+            'julia>'
+        )
+    ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '|', '%', '!', ';', '<', '>', '?', '`'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #4266d5;font-weight:bold;',    // Reserved
+            2 => 'color: #0000A8;font-weight:bold;',    // Built-ins
+            3 => 'color: #0000A8;font-weight:bold;',    // System Interaction
+            4 => 'color: #3b972e;font-weight:bold;'     // Prompt
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #888888;',
+            'MULTI' => 'color: #888888;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #3b972e;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #c93d39;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: black;'
+        ),
+        'METHODS' => array(
+            1 => 'color: black;'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #6bab5b;'
+        ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+    ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+    ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+    ),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/htdocs/application/libraries/geshi/geshi/julia.php.bak b/htdocs/application/libraries/geshi/geshi/julia.php.bak
new file mode 100644
index 0000000..8c717c0
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/julia.php.bak
@@ -0,0 +1,172 @@
+<?php
+/*************************************************************************************
+ * julia.php
+ * -----------
+ * Author: John Lynch (john.lynch@iname.com)
+ * Copyright: (c) 2013 John Lynch
+ * Release Version: 1.0.8.12
+ * Date Started: 2013/11/06
+ *
+ * Julia language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * 2013/11/?? (1.0.0)
+ *   -  First Release
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Julia',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    //Longest quotemarks ALWAYS first
+    'QUOTEMARKS' => array('"""', '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+
+        /*
+        ** reserved words
+        */
+        1 => array(
+            'function', 'global', 'for', 'end', 'while', 'if', 'else', 'elseif', 'break',
+            'switch', 'case', 'otherwise', 'try', 'catch', 'end', 'const', 'immutable',
+            'import', 'importall', 'export', 'type', 'typealias', 'return', 'true',
+            'false', 'macro', 'quote', 'in', 'abstract', 'module', 'using', 'continue',
+            'ifelse', 'do', 'eval', 'let', 'finally', 'throw'
+            ),
+
+        /*
+        ** builtins
+        */
+        2 => array(
+            'Array', 'String', 'Bool', 'Number', 'Int', 'Integer', 'Real', 'Complex',
+            'FloatingPoint', 'Float64', 'Float32', 'Int8', 'Int16', 'Int32', 'Int64',
+            'Rational', 'AbstractArray', 'Unsigned', 'Signed', 'Uint', 'Uint8', 'Uint16',
+            'Uint32', 'Uint64', 'Vector', 'AbstractVector', 'Matrix', 'AbstractMatrix',
+            'Type', 'IO', 'Any', 'ASCIIString', 'Union', 'Dict', 'Function', 'SubArray',
+            'Range', 'Range1', 'Symbol', 'Expr',
+
+            'cell', 'collect', 'filter', 'merge', 'divrem', 'hex', 'dec', 'oct', 'base',
+            'int', 'round', 'cmp', 'float', 'linspace', 'fill',	'start', 'done', 'tuple',
+            'minimum', 'maximum', 'count', 'index', 'append', 'push', 'pop', 'shift',
+            'unshift', 'insert', 'splice', 'reverse', 'sort', 'zip', 'length', 'delete',
+            'copy', 'haskey', 'keys', 'values', 'get', 'getkey', 'Set', 'isa', 'issubset',
+            'intersect', 'setdiff', 'symdiff', 'complement', 'print', 'printf', 'println',
+            'sprintf', 'join', 'utf8', 'char', 'search', 'rsearch', 'beginswith', 'endswith',
+            'replace', 'lowercase', 'uppercase', 'ucfirst', 'lcfirst', 'union',
+            'split', 'rsplit', 'chop', 'chomp', 'lpad', 'rpad', 'lstrip', 'rstrip',
+            'strip', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl', 'isdigit',
+            'isgraph', 'islower', 'isprint', 'ispunct', 'isspace', 'isupper', 'isxdigit',
+            'match', 'captures', 'offset', 'offsets', 'matchall', 'eachmatch', 'hcat',
+            'vcat', 'hvcat', 'reshape', 'deepcopy', 'similar', 'reinterpret', 'map',
+            'reduce', 'mapreduce', 'DataArray', 'DataFrame', 'removeNA', 'replaceNA',
+            'colnames', 'head', 'tail', 'describe', 'join', 'groupby', 'by', 'stack',
+            'readtable', 'readcsv', 'readdlm', 'writetable', 'writecsv', 'writedlm',
+            'require', 'reload', 'include', 'evalfile', 'cd', 'open', 'write', 'close',
+            'position', 'seek', 'seekstart', 'seekend', 'skip', 'isopen', 'eof',
+            'isreadonly', 'ltoh', 'htol', 'serialize', 'deserialize', 'download',
+            'in', 'isequal', 'getindex', 'setindex', 'eachline', 'beginswith', 'endswith',
+            'parsefloat', 'parseint', 'seekend', 'findnz', 'DivideError', 'addprocs',
+            'scale', 'issubnormal', 'readdir', 'mapslices'
+            ),
+
+        /*
+        ** system interaction
+        */
+        3 => array(
+            'run', 'spawn', 'success', 'process_running', 'process_exited', 'kill',
+            'readsfrom', 'writesto', 'readsandwrite', 'detach', 'setenv', 'ENV', 'getpid',
+            'clipboard', 'strftime', 'time', 'cd', 'gethostname', 'getipaddr', 'pwd',
+            'mkdir', 'mkpath', 'rmdir', 'ignorestatus'
+            ),
+        /*
+        ** prompt
+        */
+        4 => array(
+            'julia>'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '|', '%', '!', ';', '<', '>', '?', '`'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #4266d5;font-weight:bold;',    // Reserved
+            2 => 'color: #0000A8;font-weight:bold;',    // Built-ins
+            3 => 'color: #0000A8;font-weight:bold;',    // System Interaction
+            4 => 'color: #3b972e;font-weight:bold;'     // Prompt
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #888888;',
+            'MULTI' => 'color: #888888;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #3b972e;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #c93d39;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: black;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #6bab5b;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/htdocs/application/libraries/geshi/geshi/kixtart.php b/htdocs/application/libraries/geshi/geshi/kixtart.php
index b2b7b93..7f66e74 100644
--- a/htdocs/application/libraries/geshi/geshi/kixtart.php
+++ b/htdocs/application/libraries/geshi/geshi/kixtart.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Riley McArdle (riley@glyff.net)
  * Copyright: (c) 2007 Riley McArdle (http://www.glyff.net/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/08/31
  *
  * PHP language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/klonec.php b/htdocs/application/libraries/geshi/geshi/klonec.php
index f4f8ac4..58f2d7b 100644
--- a/htdocs/application/libraries/geshi/geshi/klonec.php
+++ b/htdocs/application/libraries/geshi/geshi/klonec.php
@@ -4,7 +4,7 @@
  * --------
  * Author: AUGER Mickael
  * Copyright: Synchronic
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/04/16
  *
  * KLone with C language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/klonecpp.php b/htdocs/application/libraries/geshi/geshi/klonecpp.php
index e11015e..4b71cba 100644
--- a/htdocs/application/libraries/geshi/geshi/klonecpp.php
+++ b/htdocs/application/libraries/geshi/geshi/klonecpp.php
@@ -4,7 +4,7 @@
  * --------
  * Author: AUGER Mickael
  * Copyright: Synchronic
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/04/16
  *
  * KLone with C++ language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/kotlin.php b/htdocs/application/libraries/geshi/geshi/kotlin.php
index 3fd8cf0..cb20ad8 100644
--- a/htdocs/application/libraries/geshi/geshi/kotlin.php
+++ b/htdocs/application/libraries/geshi/geshi/kotlin.php
@@ -1,20 +1,17 @@
 <?php
 /*************************************************************************************
  * kotlin.php
- * ----------
- * Author: Brahimù Djoudi (jolkdarr@netscape.net)
- * Copyright: (c) 2015 Brahim Djoudi
- * Release Version: 1.0.0.0
- * Date Started: 2015/11/02
+ * --------
+ * Author: Ole Sandum (oksandum@gmail.com)
+ * Copyright: (c) 2017 Ole Sandum
+ * Release Version: 1.0.9.0
+ * Date Started: 2004/07/10
  *
  * Kotlin language file for GeSHi.
  *
- * CHANGES
- * -------
- * 2015/11/02 (1.0.0.0)
+ * 2017/01/28
  *   -  First Release
  *
- *
  *************************************************************************************
  *
  *     This file is part of GeSHi.
@@ -35,98 +32,928 @@
  *
  ************************************************************************************/
 
-$language_data = array (
+$language_data = array(
     'LANG_NAME' => 'Kotlin',
     'COMMENT_SINGLE' => array(1 => '//'),
     'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        // javadoc comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU'
+    ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'",'"'),
+    'QUOTEMARKS' => array("'", '"'),
     'ESCAPE_CHAR' => '\\',
-    'ESCAPE_REGEXP' => array(
-        // Simple Single Char Escapes
-        1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
-        // Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{1,2}#i",
-        // Hexadecimal Char Specs (unicode)
-        3 => "#\\\\u[\da-fA-F]{1,4}#",
-        // Hexadecimal Char Specs (Extended Unicode)
-        4 => "#\\\\U[\da-fA-F]{1,8}#",
-        ),
     'KEYWORDS' => array(
-        1 => array('package', 'file', 'import', 'as', 'is', 'class', 'interface', 'constructor', 'by',
-            'where', 'when', 'init', 'companion', 'object',
-            'val', 'var', 'fun', 'get', 'set', 'super', 'this', 'dynamic', 'if', 'else',
-            'try', 'catch', 'finally', 'for',  'while', 'do', 'in', 'out', 'true', 'false', 'null',
-            'throw', 'return', 'continue', 'break',
-            'abstract', 'final', 'enum', 'open', 'override', 'annotation',
-            'public', 'private', 'protected', 'internal'
-            ),
-        2 => array('Unit', 'Double', 'Float', 'Long', 'Int', 'Short', 'Byte', 'Boolean', 'Char', 'String')
+        1 => array(
+            'fun', 'var', 'val', 'typeof', 'typealias', 'suspend',
+            'for', 'if', 'else', 'while', 'do',
+            'when', 'return', 'public', 'get', 'set',
+            'private', 'protected', 'internal', 'break', 'class', 'object',
+            'companion', 'data', 'sealed', 'open', 'operator',
+            'try', 'catch', 'finally', 'inner', 'constructor', 'init',
+            'interface', 'throw', 'final', 'external', 'this',
+            'abstract', 'is', '!is', 'as', 'as?', 'continue',
+            'default', 'enum', 'package', 'super', 'where',
+            'const', 'import', 'in', '!in', 'out', 'override',
+            'reified', 'inline', 'noinline', 'crossinline'
         ),
+        2 => array(
+            'null', 'false', 'true'
+        ),
+        3 => array(
+            'AbstractAction', 'AbstractBorder', 'AbstractButton',
+            'AbstractCellEditor', 'AbstractCollection',
+            'AbstractColorChooserPanel', 'AbstractDocument',
+            'AbstractDocument.AttributeContext',
+            'AbstractDocument.Content',
+            'AbstractDocument.ElementEdit',
+            'AbstractLayoutCache',
+            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
+            'AbstractListModel', 'AbstractMap',
+            'AbstractMethodError', 'AbstractSequentialList',
+            'AbstractSet', 'AbstractTableModel',
+            'AbstractUndoableEdit', 'AbstractWriter',
+            'AccessControlContext', 'AccessControlException',
+            'AccessController', 'AccessException', 'Accessible',
+            'AccessibleAction', 'AccessibleBundle',
+            'AccessibleComponent', 'AccessibleContext',
+            'AccessibleHyperlink', 'AccessibleHypertext',
+            'AccessibleIcon', 'AccessibleObject',
+            'AccessibleRelation', 'AccessibleRelationSet',
+            'AccessibleResourceBundle', 'AccessibleRole',
+            'AccessibleSelection', 'AccessibleState',
+            'AccessibleStateSet', 'AccessibleTable',
+            'AccessibleTableModelChange', 'AccessibleText',
+            'AccessibleValue', 'Acl', 'AclEntry',
+            'AclNotFoundException', 'Action', 'ActionEvent',
+            'ActionListener', 'ActionMap', 'ActionMapUIResource',
+            'Activatable', 'ActivateFailedException',
+            'ActivationDesc', 'ActivationException',
+            'ActivationGroup', 'ActivationGroupDesc',
+            'ActivationGroupDesc.CommandEnvironment',
+            'ActivationGroupID', 'ActivationID',
+            'ActivationInstantiator', 'ActivationMonitor',
+            'ActivationSystem', 'Activator', 'ActiveEvent',
+            'Adjustable', 'AdjustmentEvent',
+            'AdjustmentListener', 'Adler32', 'AffineTransform',
+            'AffineTransformOp', 'AlgorithmParameterGenerator',
+            'AlgorithmParameterGeneratorSpi',
+            'AlgorithmParameters', 'AlgorithmParameterSpec',
+            'AlgorithmParametersSpi', 'AllPermission',
+            'AlphaComposite', 'AlreadyBound',
+            'AlreadyBoundException', 'AlreadyBoundHelper',
+            'AlreadyBoundHolder', 'AncestorEvent',
+            'AncestorListener', 'Annotation', 'AnyHolder',
+            'AnySeqHelper', 'AnySeqHolder', 'Applet',
+            'AppletContext', 'AppletInitializer', 'AppletStub',
+            'ApplicationException', 'Arc2D', 'Arc2D.Double',
+            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
+            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
+            'ArithmeticException', 'Array',
+            'ArrayIndexOutOfBoundsException', 'ArrayList',
+            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
+            'Attribute', 'AttributedCharacterIterator',
+            'AttributedCharacterIterator.Attribute',
+            'AttributedString', 'AttributeInUseException',
+            'AttributeList', 'AttributeModificationException',
+            'Attributes', 'Attributes.Name', 'AttributeSet',
+            'AttributeSet.CharacterAttribute',
+            'AttributeSet.ColorAttribute',
+            'AttributeSet.FontAttribute',
+            'AttributeSet.ParagraphAttribute', 'AudioClip',
+            'AudioFileFormat', 'AudioFileFormat.Type',
+            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
+            'AudioFormat.Encoding', 'AudioInputStream',
+            'AudioPermission', 'AudioSystem',
+            'AuthenticationException',
+            'AuthenticationNotSupportedException',
+            'Authenticator', 'Autoscroll', 'AWTError',
+            'AWTEvent', 'AWTEventListener',
+            'AWTEventMulticaster', 'AWTException',
+            'AWTPermission', 'BadKind', 'BadLocationException',
+            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
+            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
+            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
+            'BandedSampleModel', 'BasicArrowButton',
+            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
+            'BasicBorders.ButtonBorder',
+            'BasicBorders.FieldBorder',
+            'BasicBorders.MarginBorder',
+            'BasicBorders.MenuBarBorder',
+            'BasicBorders.RadioButtonBorder',
+            'BasicBorders.SplitPaneBorder',
+            'BasicBorders.ToggleButtonBorder',
+            'BasicButtonListener', 'BasicButtonUI',
+            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
+            'BasicColorChooserUI', 'BasicComboBoxEditor',
+            'BasicComboBoxEditor.UIResource',
+            'BasicComboBoxRenderer',
+            'BasicComboBoxRenderer.UIResource',
+            'BasicComboBoxUI', 'BasicComboPopup',
+            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
+            'BasicDirectoryModel', 'BasicEditorPaneUI',
+            'BasicFileChooserUI', 'BasicGraphicsUtils',
+            'BasicHTML', 'BasicIconFactory',
+            'BasicInternalFrameTitlePane',
+            'BasicInternalFrameUI', 'BasicLabelUI',
+            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
+            'BasicMenuItemUI', 'BasicMenuUI',
+            'BasicOptionPaneUI',
+            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
+            'BasicPasswordFieldUI', 'BasicPermission',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
+            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
+            'BasicRadioButtonUI', 'BasicRootPaneUI',
+            'BasicScrollBarUI', 'BasicScrollPaneUI',
+            'BasicSeparatorUI', 'BasicSliderUI',
+            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
+            'BasicStroke', 'BasicTabbedPaneUI',
+            'BasicTableHeaderUI', 'BasicTableUI',
+            'BasicTextAreaUI', 'BasicTextFieldUI',
+            'BasicTextPaneUI', 'BasicTextUI',
+            'BasicTextUI.BasicCaret',
+            'BasicTextUI.BasicHighlighter',
+            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
+            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
+            'BasicViewportUI', 'BatchUpdateException',
+            'BeanContext', 'BeanContextChild',
+            'BeanContextChildComponentProxy',
+            'BeanContextChildSupport',
+            'BeanContextContainerProxy', 'BeanContextEvent',
+            'BeanContextMembershipEvent',
+            'BeanContextMembershipListener', 'BeanContextProxy',
+            'BeanContextServiceAvailableEvent',
+            'BeanContextServiceProvider',
+            'BeanContextServiceProviderBeanInfo',
+            'BeanContextServiceRevokedEvent',
+            'BeanContextServiceRevokedListener',
+            'BeanContextServices', 'BeanContextServicesListener',
+            'BeanContextServicesSupport',
+            'BeanContextServicesSupport.BCSSServiceProvider',
+            'BeanContextSupport',
+            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
+            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
+            'BigInteger', 'BinaryRefAddr', 'BindException',
+            'Binding', 'BindingHelper', 'BindingHolder',
+            'BindingIterator', 'BindingIteratorHelper',
+            'BindingIteratorHolder', 'BindingIteratorOperations',
+            'BindingListHelper', 'BindingListHolder',
+            'BindingType', 'BindingTypeHelper',
+            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
+            'Book', 'BooleanControl',
+            'BooleanControl.Type', 'BooleanHolder',
+            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
+            'BorderFactory', 'BorderLayout', 'BorderUIResource',
+            'BorderUIResource.BevelBorderUIResource',
+            'BorderUIResource.CompoundBorderUIResource',
+            'BorderUIResource.EmptyBorderUIResource',
+            'BorderUIResource.EtchedBorderUIResource',
+            'BorderUIResource.LineBorderUIResource',
+            'BorderUIResource.MatteBorderUIResource',
+            'BorderUIResource.TitledBorderUIResource',
+            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
+            'BoxedValueHelper', 'BoxLayout', 'BoxView',
+            'BreakIterator', 'BufferedImage',
+            'BufferedImageFilter', 'BufferedImageOp',
+            'BufferedInputStream', 'BufferedOutputStream',
+            'BufferedReader', 'BufferedWriter', 'Button',
+            'ButtonGroup', 'ButtonModel', 'ButtonUI',
+            'ByteArrayInputStream', 'ByteArrayOutputStream',
+            'ByteHolder', 'ByteLookupTable', 'Calendar',
+            'CallableStatement', 'CannotProceed',
+            'CannotProceedException', 'CannotProceedHelper',
+            'CannotProceedHolder', 'CannotRedoException',
+            'CannotUndoException', 'Canvas', 'CardLayout',
+            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
+            'CellEditorListener', 'CellRendererPane',
+            'Certificate', 'Certificate.CertificateRep',
+            'CertificateEncodingException',
+            'CertificateException',
+            'CertificateExpiredException', 'CertificateFactory',
+            'CertificateFactorySpi',
+            'CertificateNotYetValidException',
+            'CertificateParsingException',
+            'ChangedCharSetException', 'ChangeEvent',
+            'ChangeListener', 'Character', 'Character.Subset',
+            'Character.UnicodeBlock', 'CharacterIterator',
+            'CharArrayReader', 'CharArrayWriter',
+            'CharConversionException', 'CharHolder',
+            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
+            'CheckboxGroup', 'CheckboxMenuItem',
+            'CheckedInputStream', 'CheckedOutputStream',
+            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
+            'ClassCastException', 'ClassCircularityError',
+            'ClassDesc', 'ClassFormatError', 'ClassLoader',
+            'ClassNotFoundException', 'Clip', 'Clipboard',
+            'ClipboardOwner', 'Clob', 'Cloneable',
+            'CloneNotSupportedException', 'CMMException',
+            'CodeSource', 'CollationElementIterator',
+            'CollationKey', 'Collator', 'Collection',
+            'Collections', 'Color',
+            'ColorChooserComponentFactory', 'ColorChooserUI',
+            'ColorConvertOp', 'ColorModel',
+            'ColorSelectionModel', 'ColorSpace',
+            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
+            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
+            'COMM_FAILURE', 'Comparable', 'Comparator',
+            'Compiler', 'CompletionStatus',
+            'CompletionStatusHelper', 'Component',
+            'ComponentAdapter', 'ComponentColorModel',
+            'ComponentEvent', 'ComponentInputMap',
+            'ComponentInputMapUIResource', 'ComponentListener',
+            'ComponentOrientation', 'ComponentSampleModel',
+            'ComponentUI', 'ComponentView', 'Composite',
+            'CompositeContext', 'CompositeName', 'CompositeView',
+            'CompoundBorder', 'CompoundControl',
+            'CompoundControl.Type', 'CompoundEdit',
+            'CompoundName', 'ConcurrentModificationException',
+            'ConfigurationException', 'ConnectException',
+            'ConnectIOException', 'Connection', 'Constructor', 'Container',
+            'ContainerAdapter', 'ContainerEvent',
+            'ContainerListener', 'ContentHandler',
+            'ContentHandlerFactory', 'ContentModel', 'Context',
+            'ContextList', 'ContextNotEmptyException',
+            'ContextualRenderedImageFactory', 'Control',
+            'Control.Type', 'ControlFactory',
+            'ControllerEventListener', 'ConvolveOp', 'CRC32',
+            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
+            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
+            'CubicCurve2D', 'CubicCurve2D.Double',
+            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
+            'CurrentHolder', 'CurrentOperations', 'Cursor',
+            'Customizer', 'CustomMarshal', 'CustomValue',
+            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
+            'DataBufferInt', 'DataBufferShort',
+            'DataBufferUShort', 'DataFlavor',
+            'DataFormatException', 'DatagramPacket',
+            'DatagramSocket', 'DatagramSocketImpl',
+            'DatagramSocketImplFactory', 'DataInput',
+            'DataInputStream', 'DataLine', 'DataLine.Info',
+            'DataOutput', 'DataOutputStream',
+            'DataTruncation', 'DATA_CONVERSION', 'Date',
+            'DateFormat', 'DateFormatSymbols', 'DebugGraphics',
+            'DecimalFormat', 'DecimalFormatSymbols',
+            'DefaultBoundedRangeModel', 'DefaultButtonModel',
+            'DefaultCaret', 'DefaultCellEditor',
+            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
+            'DefaultDesktopManager', 'DefaultEditorKit',
+            'DefaultEditorKit.BeepAction',
+            'DefaultEditorKit.CopyAction',
+            'DefaultEditorKit.CutAction',
+            'DefaultEditorKit.DefaultKeyTypedAction',
+            'DefaultEditorKit.InsertBreakAction',
+            'DefaultEditorKit.InsertContentAction',
+            'DefaultEditorKit.InsertTabAction',
+            'DefaultEditorKit.PasteAction,',
+            'DefaultFocusManager', 'DefaultHighlighter',
+            'DefaultHighlighter.DefaultHighlightPainter',
+            'DefaultListCellRenderer',
+            'DefaultListCellRenderer.UIResource',
+            'DefaultListModel', 'DefaultListSelectionModel',
+            'DefaultMenuLayout', 'DefaultMetalTheme',
+            'DefaultMutableTreeNode',
+            'DefaultSingleSelectionModel',
+            'DefaultStyledDocument',
+            'DefaultStyledDocument.AttributeUndoableEdit',
+            'DefaultStyledDocument.ElementSpec',
+            'DefaultTableCellRenderer',
+            'DefaultTableCellRenderer.UIResource',
+            'DefaultTableColumnModel', 'DefaultTableModel',
+            'DefaultTextUI', 'DefaultTreeCellEditor',
+            'DefaultTreeCellRenderer', 'DefaultTreeModel',
+            'DefaultTreeSelectionModel', 'DefinitionKind',
+            'DefinitionKindHelper', 'Deflater',
+            'DeflaterOutputStream', 'Delegate', 'DesignMode',
+            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
+            'DGC', 'Dialog', 'Dictionary', 'DigestException',
+            'DigestInputStream', 'DigestOutputStream',
+            'Dimension', 'Dimension2D', 'DimensionUIResource',
+            'DirContext', 'DirectColorModel', 'DirectoryManager',
+            'DirObjectFactory', 'DirStateFactory',
+            'DirStateFactory.Result', 'DnDConstants', 'Document',
+            'DocumentEvent', 'DocumentEvent.ElementChange',
+            'DocumentEvent.EventType', 'DocumentListener',
+            'DocumentParser', 'DomainCombiner', 'DomainManager',
+            'DomainManagerOperations', 'DoubleHolder',
+            'DoubleSeqHelper', 'DoubleSeqHolder',
+            'DragGestureEvent', 'DragGestureListener',
+            'DragGestureRecognizer', 'DragSource',
+            'DragSourceContext', 'DragSourceDragEvent',
+            'DragSourceDropEvent', 'DragSourceEvent',
+            'DragSourceListener', 'Driver', 'DriverManager',
+            'DriverPropertyInfo', 'DropTarget',
+            'DropTarget.DropTargetAutoScroller',
+            'DropTargetContext', 'DropTargetDragEvent',
+            'DropTargetDropEvent', 'DropTargetEvent',
+            'DropTargetListener', 'DSAKey',
+            'DSAKeyPairGenerator', 'DSAParameterSpec',
+            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
+            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
+            'DTDConstants', 'DynamicImplementation', 'DynAny',
+            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
+            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
+            'Element', 'ElementIterator', 'Ellipse2D',
+            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
+            'EmptyStackException', 'EncodedKeySpec', 'Entity',
+            'EnumControl', 'EnumControl.Type', 'Enumeration',
+            'Environment', 'EOFException', 'Error',
+            'EtchedBorder', 'Event', 'EventContext',
+            'EventDirContext', 'EventListener',
+            'EventListenerList', 'EventObject', 'EventQueue',
+            'EventSetDescriptor', 'Exception',
+            'ExceptionInInitializerError', 'ExceptionList',
+            'ExpandVetoException', 'ExportException',
+            'ExtendedRequest', 'ExtendedResponse',
+            'Externalizable', 'FeatureDescriptor', 'Field',
+            'FieldNameHelper', 'FieldPosition', 'FieldView',
+            'File', 'FileChooserUI', 'FileDescriptor',
+            'FileDialog', 'FileFilter',
+            'FileInputStream', 'FilenameFilter', 'FileNameMap',
+            'FileNotFoundException', 'FileOutputStream',
+            'FilePermission', 'FileReader', 'FileSystemView',
+            'FileView', 'FileWriter', 'FilteredImageSource',
+            'FilterInputStream', 'FilterOutputStream',
+            'FilterReader', 'FilterWriter',
+            'FixedHeightLayoutCache', 'FixedHolder',
+            'FlatteningPathIterator', 'FlavorMap',
+            'FloatControl', 'FloatControl.Type', 'FloatHolder',
+            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
+            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
+            'FocusEvent', 'FocusListener', 'FocusManager',
+            'Font', 'FontFormatException', 'FontMetrics',
+            'FontRenderContext', 'FontUIResource', 'Format',
+            'FormatConversionProvider', 'FormView', 'Frame',
+            'FREE_MEM', 'GapContent', 'GeneralPath',
+            'GeneralSecurityException', 'GlyphJustificationInfo',
+            'GlyphMetrics', 'GlyphVector', 'GlyphView',
+            'GlyphView.GlyphPainter', 'GradientPaint',
+            'GraphicAttribute', 'Graphics', 'Graphics2D',
+            'GraphicsConfigTemplate', 'GraphicsConfiguration',
+            'GraphicsDevice', 'GraphicsEnvironment',
+            'GrayFilter', 'GregorianCalendar',
+            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
+            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
+            'GZIPOutputStream', 'HasControls', 'HashMap',
+            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
+            'HierarchyBoundsListener', 'HierarchyEvent',
+            'HierarchyListener', 'Highlighter',
+            'Highlighter.Highlight',
+            'Highlighter.HighlightPainter', 'HTML',
+            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
+            'HTMLDocument', 'HTMLDocument.Iterator',
+            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
+            'HTMLEditorKit.HTMLTextAction',
+            'HTMLEditorKit.InsertHTMLTextAction',
+            'HTMLEditorKit.LinkController',
+            'HTMLEditorKit.Parser',
+            'HTMLEditorKit.ParserCallback',
+            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
+            'HttpURLConnection', 'HyperlinkEvent',
+            'HyperlinkEvent.EventType', 'HyperlinkListener',
+            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
+            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
+            'IconView', 'IdentifierHelper', 'Identity',
+            'IdentityScope', 'IDLEntity', 'IDLType',
+            'IDLTypeHelper', 'IDLTypeOperations',
+            'IllegalAccessError', 'IllegalAccessException',
+            'IllegalArgumentException',
+            'IllegalComponentStateException',
+            'IllegalMonitorStateException',
+            'IllegalPathStateException', 'IllegalStateException',
+            'IllegalThreadStateException', 'Image',
+            'ImageConsumer', 'ImageFilter',
+            'ImageGraphicAttribute', 'ImageIcon',
+            'ImageObserver', 'ImageProducer',
+            'ImagingOpException', 'IMP_LIMIT',
+            'IncompatibleClassChangeError',
+            'InconsistentTypeCode', 'IndexColorModel',
+            'IndexedPropertyDescriptor',
+            'IndexOutOfBoundsException', 'IndirectionException',
+            'InetAddress', 'Inflater', 'InflaterInputStream',
+            'InheritableThreadLocal', 'InitialContext',
+            'InitialContextFactory',
+            'InitialContextFactoryBuilder', 'InitialDirContext',
+            'INITIALIZE', 'Initializer', 'InitialLdapContext',
+            'InlineView', 'InputContext', 'InputEvent',
+            'InputMap', 'InputMapUIResource', 'InputMethod',
+            'InputMethodContext', 'InputMethodDescriptor',
+            'InputMethodEvent', 'InputMethodHighlight',
+            'InputMethodListener', 'InputMethodRequests',
+            'InputStream',
+            'InputStreamReader', 'InputSubset', 'InputVerifier',
+            'Insets', 'InsetsUIResource', 'InstantiationError',
+            'InstantiationException', 'Instrument',
+            'InsufficientResourcesException', 'Integer',
+            'INTERNAL', 'InternalError', 'InternalFrameAdapter',
+            'InternalFrameEvent', 'InternalFrameListener',
+            'InternalFrameUI', 'InterruptedException',
+            'InterruptedIOException',
+            'InterruptedNamingException', 'INTF_REPOS',
+            'IntHolder', 'IntrospectionException',
+            'Introspector', 'Invalid',
+            'InvalidAlgorithmParameterException',
+            'InvalidAttributeIdentifierException',
+            'InvalidAttributesException',
+            'InvalidAttributeValueException',
+            'InvalidClassException',
+            'InvalidDnDOperationException',
+            'InvalidKeyException', 'InvalidKeySpecException',
+            'InvalidMidiDataException', 'InvalidName',
+            'InvalidNameException',
+            'InvalidNameHelper', 'InvalidNameHolder',
+            'InvalidObjectException',
+            'InvalidParameterException',
+            'InvalidParameterSpecException',
+            'InvalidSearchControlsException',
+            'InvalidSearchFilterException', 'InvalidSeq',
+            'InvalidTransactionException', 'InvalidValue',
+            'INVALID_TRANSACTION', 'InvocationEvent',
+            'InvocationHandler', 'InvocationTargetException',
+            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
+            'INV_OBJREF', 'INV_POLICY', 'IOException',
+            'IRObject', 'IRObjectOperations', 'IstringHelper',
+            'ItemEvent', 'ItemListener', 'ItemSelectable',
+            'Iterator', 'JApplet', 'JarEntry', 'JarException',
+            'JarFile', 'JarInputStream', 'JarOutputStream',
+            'JarURLConnection', 'JButton', 'JCheckBox',
+            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
+            'JComboBox.KeySelectionManager', 'JComponent',
+            'JDesktopPane', 'JDialog', 'JEditorPane',
+            'JFileChooser', 'JFrame', 'JInternalFrame',
+            'JInternalFrame.JDesktopIcon', 'JLabel',
+            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
+            'JMenuItem', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType',
+            'JobAttributes.DestinationType',
+            'JobAttributes.DialogType',
+            'JobAttributes.MultipleDocumentHandlingType',
+            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
+            'JPasswordField', 'JPopupMenu',
+            'JPopupMenu.Separator', 'JProgressBar',
+            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
+            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
+            'JSplitPane', 'JTabbedPane', 'JTable',
+            'JTableHeader', 'JTextArea', 'JTextComponent',
+            'JTextComponent.KeyBinding', 'JTextField',
+            'JTextPane', 'JToggleButton',
+            'JToggleButton.ToggleButtonModel', 'JToolBar',
+            'JToolBar.Separator', 'JToolTip', 'JTree',
+            'JTree.DynamicUtilTreeNode',
+            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
+            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
+            'KeyException', 'KeyFactory', 'KeyFactorySpi',
+            'KeyListener', 'KeyManagementException', 'Keymap',
+            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
+            'KeySpec', 'KeyStore', 'KeyStoreException',
+            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
+            'LabelView', 'LastOwnerException',
+            'LayeredHighlighter',
+            'LayeredHighlighter.LayerPainter', 'LayoutManager',
+            'LayoutManager2', 'LayoutQueue', 'LdapContext',
+            'LdapReferralException', 'Lease',
+            'LimitExceededException', 'Line', 'Line.Info',
+            'Line2D', 'Line2D.Double', 'Line2D.Float',
+            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
+            'LineEvent.Type', 'LineListener', 'LineMetrics',
+            'LineNumberInputStream', 'LineNumberReader',
+            'LineUnavailableException', 'LinkageError',
+            'LinkedList', 'LinkException', 'LinkLoopException',
+            'LinkRef', 'List', 'ListCellRenderer',
+            'ListDataEvent', 'ListDataListener', 'ListIterator',
+            'ListModel', 'ListResourceBundle',
+            'ListSelectionEvent', 'ListSelectionListener',
+            'ListSelectionModel', 'ListUI', 'ListView',
+            'LoaderHandler', 'Locale', 'LocateRegistry',
+            'LogStream', 'LongHolder',
+            'LongLongSeqHelper', 'LongLongSeqHolder',
+            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
+            'LookupOp', 'LookupTable', 'MalformedLinkException',
+            'MalformedURLException', 'Manifest', 'Map',
+            'Map.Entry', 'MARSHAL', 'MarshalException',
+            'MarshalledObject', 'Math', 'MatteBorder',
+            'MediaTracker', 'Member', 'MemoryImageSource',
+            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
+            'MenuContainer', 'MenuDragMouseEvent',
+            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
+            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
+            'MenuKeyListener', 'MenuListener',
+            'MenuSelectionManager', 'MenuShortcut',
+            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
+            'MetaEventListener', 'MetalBorders',
+            'MetalBorders.ButtonBorder',
+            'MetalBorders.Flush3DBorder',
+            'MetalBorders.InternalFrameBorder',
+            'MetalBorders.MenuBarBorder',
+            'MetalBorders.MenuItemBorder',
+            'MetalBorders.OptionDialogBorder',
+            'MetalBorders.PaletteBorder',
+            'MetalBorders.PopupMenuBorder',
+            'MetalBorders.RolloverButtonBorder',
+            'MetalBorders.ScrollPaneBorder',
+            'MetalBorders.TableHeaderBorder',
+            'MetalBorders.TextFieldBorder',
+            'MetalBorders.ToggleButtonBorder',
+            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
+            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
+            'MetalComboBoxButton', 'MetalComboBoxEditor',
+            'MetalComboBoxEditor.UIResource',
+            'MetalComboBoxIcon', 'MetalComboBoxUI',
+            'MetalDesktopIconUI', 'MetalFileChooserUI',
+            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
+            'MetalIconFactory.FolderIcon16',
+            'MetalIconFactory.PaletteCloseIcon',
+            'MetalIconFactory.TreeControlIcon',
+            'MetalIconFactory.TreeFolderIcon',
+            'MetalIconFactory.TreeLeafIcon',
+            'MetalInternalFrameTitlePane',
+            'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
+            'MetalProgressBarUI', 'MetalRadioButtonUI',
+            'MetalScrollBarUI', 'MetalScrollButton',
+            'MetalScrollPaneUI', 'MetalSeparatorUI',
+            'MetalSliderUI', 'MetalSplitPaneUI',
+            'MetalTabbedPaneUI', 'MetalTextFieldUI',
+            'MetalTheme', 'MetalToggleButtonUI',
+            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
+            'MetaMessage', 'Method', 'MethodDescriptor',
+            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
+            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
+            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
+            'MidiSystem', 'MidiUnavailableException',
+            'MimeTypeParseException', 'MinimalHTMLWriter',
+            'MissingResourceException', 'Mixer', 'Mixer.Info',
+            'MixerProvider', 'ModificationItem', 'Modifier',
+            'MouseAdapter', 'MouseDragGestureRecognizer',
+            'MouseEvent', 'MouseInputAdapter',
+            'MouseInputListener', 'MouseListener',
+            'MouseMotionAdapter', 'MouseMotionListener',
+            'MultiButtonUI', 'MulticastSocket',
+            'MultiColorChooserUI', 'MultiComboBoxUI',
+            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
+            'MultiFileChooserUI', 'MultiInternalFrameUI',
+            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
+            'MultiMenuBarUI', 'MultiMenuItemUI',
+            'MultiOptionPaneUI', 'MultiPanelUI',
+            'MultiPixelPackedSampleModel', 'MultipleMaster',
+            'MultiPopupMenuUI', 'MultiProgressBarUI',
+            'MultiScrollBarUI', 'MultiScrollPaneUI',
+            'MultiSeparatorUI', 'MultiSliderUI',
+            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
+            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
+            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
+            'MultiViewportUI', 'MutableAttributeSet',
+            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
+            'NameAlreadyBoundException', 'NameClassPair',
+            'NameComponent', 'NameComponentHelper',
+            'NameComponentHolder', 'NamedValue', 'NameHelper',
+            'NameHolder', 'NameNotFoundException', 'NameParser',
+            'NamespaceChangeListener', 'NameValuePair',
+            'NameValuePairHelper', 'Naming', 'NamingContext',
+            'NamingContextHelper', 'NamingContextHolder',
+            'NamingContextOperations', 'NamingEnumeration',
+            'NamingEvent', 'NamingException',
+            'NamingExceptionEvent', 'NamingListener',
+            'NamingManager', 'NamingSecurityException',
+            'NegativeArraySizeException', 'NetPermission',
+            'NoClassDefFoundError', 'NoInitialContextException',
+            'NoninvertibleTransformException',
+            'NoPermissionException', 'NoRouteToHostException',
+            'NoSuchAlgorithmException',
+            'NoSuchAttributeException', 'NoSuchElementException',
+            'NoSuchFieldError', 'NoSuchFieldException',
+            'NoSuchMethodError', 'NoSuchMethodException',
+            'NoSuchObjectException', 'NoSuchProviderException',
+            'NotActiveException', 'NotBoundException',
+            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
+            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
+            'NotFoundHolder', 'NotFoundReason',
+            'NotFoundReasonHelper', 'NotFoundReasonHolder',
+            'NotOwnerException', 'NotSerializableException',
+            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
+            'NO_RESOURCES', 'NO_RESPONSE',
+            'NullPointerException', 'Number', 'NumberFormat',
+            'NumberFormatException', 'NVList', 'Object',
+            'ObjectChangeListener', 'ObjectFactory',
+            'ObjectFactoryBuilder', 'ObjectHelper',
+            'ObjectHolder', 'ObjectImpl',
+            'ObjectInput', 'ObjectInputStream',
+            'ObjectInputStream.GetField',
+            'ObjectInputValidation', 'ObjectOutput',
+            'ObjectOutputStream', 'ObjectOutputStream.PutField',
+            'ObjectStreamClass', 'ObjectStreamConstants',
+            'ObjectStreamException', 'ObjectStreamField',
+            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
+            'OBJ_ADAPTER', 'Observable', 'Observer',
+            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
+            'OpenType', 'Operation',
+            'OperationNotSupportedException', 'Option',
+            'OptionalDataException', 'OptionPaneUI', 'ORB',
+            'OutOfMemoryError', 'OutputStream',
+            'OutputStreamWriter', 'OverlayLayout', 'Owner',
+            'Package', 'PackedColorModel', 'Pageable',
+            'PageAttributes', 'PageAttributes.ColorType',
+            'PageAttributes.MediaType',
+            'PageAttributes.OrientationRequestedType',
+            'PageAttributes.OriginType',
+            'PageAttributes.PrintQualityType', 'PageFormat',
+            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
+            'PanelUI', 'Paper', 'ParagraphView',
+            'ParameterBlock', 'ParameterDescriptor',
+            'ParseException', 'ParsePosition', 'Parser',
+            'ParserDelegator', 'PartialResultException',
+            'PasswordAuthentication', 'PasswordView', 'Patch',
+            'PathIterator', 'Permission',
+            'PermissionCollection', 'Permissions',
+            'PERSIST_STORE', 'PhantomReference',
+            'PipedInputStream', 'PipedOutputStream',
+            'PipedReader', 'PipedWriter', 'PixelGrabber',
+            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
+            'PlainDocument', 'PlainView', 'Point', 'Point2D',
+            'Point2D.Double', 'Point2D.Float', 'Policy',
+            'PolicyError', 'PolicyHelper',
+            'PolicyHolder', 'PolicyListHelper',
+            'PolicyListHolder', 'PolicyOperations',
+            'PolicyTypeHelper', 'Polygon', 'PopupMenu',
+            'PopupMenuEvent', 'PopupMenuListener', 'PopupMenuUI',
+            'Port', 'Port.Info', 'PortableRemoteObject',
+            'PortableRemoteObjectDelegate', 'Position',
+            'Position.Bias', 'PreparedStatement', 'Principal',
+            'PrincipalHolder', 'Printable',
+            'PrinterAbortException', 'PrinterException',
+            'PrinterGraphics', 'PrinterIOException',
+            'PrinterJob', 'PrintGraphics', 'PrintJob',
+            'PrintStream', 'PrintWriter', 'PrivateKey',
+            'PRIVATE_MEMBER', 'PrivilegedAction',
+            'PrivilegedActionException',
+            'PrivilegedExceptionAction', 'Process',
+            'ProfileDataException', 'ProgressBarUI',
+            'ProgressMonitor', 'ProgressMonitorInputStream',
+            'Properties', 'PropertyChangeEvent',
+            'PropertyChangeListener', 'PropertyChangeSupport',
+            'PropertyDescriptor', 'PropertyEditor',
+            'PropertyEditorManager', 'PropertyEditorSupport',
+            'PropertyPermission', 'PropertyResourceBundle',
+            'PropertyVetoException', 'ProtectionDomain',
+            'ProtocolException', 'Provider', 'ProviderException',
+            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
+            'PushbackInputStream', 'PushbackReader',
+            'QuadCurve2D', 'QuadCurve2D.Double',
+            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
+            'Raster', 'RasterFormatException', 'RasterOp',
+            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
+            'Rectangle2D.Double', 'Rectangle2D.Float',
+            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
+            'Referenceable', 'ReferenceQueue',
+            'ReferralException', 'ReflectPermission', 'Registry',
+            'RegistryHandler', 'RemarshalException', 'Remote',
+            'RemoteCall', 'RemoteException', 'RemoteObject',
+            'RemoteRef', 'RemoteServer', 'RemoteStub',
+            'RenderableImage', 'RenderableImageOp',
+            'RenderableImageProducer', 'RenderContext',
+            'RenderedImage', 'RenderedImageFactory', 'Renderer',
+            'RenderingHints', 'RenderingHints.Key',
+            'RepaintManager', 'ReplicateScaleFilter',
+            'Repository', 'RepositoryIdHelper', 'Request',
+            'RescaleOp', 'Resolver', 'ResolveResult',
+            'ResourceBundle', 'ResponseHandler', 'ResultSet',
+            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
+            'RMIClassLoader', 'RMIClientSocketFactory',
+            'RMIFailureHandler', 'RMISecurityException',
+            'RMISecurityManager', 'RMIServerSocketFactory',
+            'RMISocketFactory', 'Robot', 'RootPaneContainer',
+            'RootPaneUI', 'RoundRectangle2D',
+            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
+            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
+            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
+            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
+            'RSAPublicKeySpec', 'RTFEditorKit',
+            'RuleBasedCollator', 'Runnable', 'RunTime',
+            'Runtime', 'RuntimeException', 'RunTimeOperations',
+            'RuntimePermission', 'SampleModel',
+            'SchemaViolationException', 'Scrollable',
+            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
+            'ScrollPaneConstants', 'ScrollPaneLayout',
+            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
+            'SearchControls', 'SearchResult',
+            'SecureClassLoader', 'SecureRandom',
+            'SecureRandomSpi', 'Security', 'SecurityException',
+            'SecurityManager', 'SecurityPermission', 'Segment',
+            'SeparatorUI', 'Sequence', 'SequenceInputStream',
+            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
+            'SerializablePermission', 'ServantObject',
+            'ServerCloneException', 'ServerError',
+            'ServerException', 'ServerNotActiveException',
+            'ServerRef', 'ServerRequest',
+            'ServerRuntimeException', 'ServerSocket',
+            'ServiceDetail', 'ServiceDetailHelper',
+            'ServiceInformation', 'ServiceInformationHelper',
+            'ServiceInformationHolder',
+            'ServiceUnavailableException', 'Set',
+            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
+            'ShapeGraphicAttribute', 'ShortHolder',
+            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
+            'ShortSeqHolder', 'Signature', 'SignatureException',
+            'SignatureSpi', 'SignedObject', 'Signer',
+            'SimpleAttributeSet', 'SimpleBeanInfo',
+            'SimpleDateFormat', 'SimpleTimeZone',
+            'SinglePixelPackedSampleModel',
+            'SingleSelectionModel', 'SizeLimitExceededException',
+            'SizeRequirements', 'SizeSequence', 'Skeleton',
+            'SkeletonMismatchException',
+            'SkeletonNotFoundException', 'SliderUI', 'Socket',
+            'SocketException', 'SocketImpl', 'SocketImplFactory',
+            'SocketOptions', 'SocketPermission',
+            'SocketSecurityException', 'SoftBevelBorder',
+            'SoftReference', 'SortedMap', 'SortedSet',
+            'Soundbank', 'SoundbankReader', 'SoundbankResource',
+            'SourceDataLine', 'SplitPaneUI', 'SQLData',
+            'SQLException', 'SQLInput', 'SQLOutput',
+            'SQLPermission', 'SQLWarning', 'Stack',
+            'StackOverflowError', 'StateEdit', 'StateEditable',
+            'StateFactory', 'Statement', 'Streamable',
+            'StreamableValue', 'StreamCorruptedException',
+            'StreamTokenizer', 'StrictMath', 'String',
+            'StringBuffer', 'StringBufferInputStream',
+            'StringCharacterIterator', 'StringContent',
+            'StringHolder', 'StringIndexOutOfBoundsException',
+            'StringReader', 'StringRefAddr', 'StringSelection',
+            'StringTokenizer', 'StringValueHelper',
+            'StringWriter', 'Stroke', 'Struct', 'StructMember',
+            'StructMemberHelper', 'Stub', 'StubDelegate',
+            'StubNotFoundException', 'Style', 'StyleConstants',
+            'StyleConstants.CharacterConstants',
+            'StyleConstants.ColorConstants',
+            'StyleConstants.FontConstants',
+            'StyleConstants.ParagraphConstants', 'StyleContext',
+            'StyledDocument', 'StyledEditorKit',
+            'StyledEditorKit.AlignmentAction',
+            'StyledEditorKit.BoldAction',
+            'StyledEditorKit.FontFamilyAction',
+            'StyledEditorKit.FontSizeAction',
+            'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction',
+            'StyledEditorKit.StyledTextAction',
+            'StyledEditorKit.UnderlineAction', 'StyleSheet',
+            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
+            'SwingConstants', 'SwingPropertyChangeSupport',
+            'SwingUtilities', 'SyncFailedException',
+            'Synthesizer', 'SysexMessage', 'System',
+            'SystemColor', 'SystemException', 'SystemFlavorMap',
+            'TabableView', 'TabbedPaneUI', 'TabExpander',
+            'TableCellEditor', 'TableCellRenderer',
+            'TableColumn', 'TableColumnModel',
+            'TableColumnModelEvent', 'TableColumnModelListener',
+            'TableHeaderUI', 'TableModel', 'TableModelEvent',
+            'TableModelListener', 'TableUI', 'TableView',
+            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
+            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
+            'TextComponent', 'TextEvent', 'TextField',
+            'TextHitInfo', 'TextLayout',
+            'TextLayout.CaretPolicy', 'TextListener',
+            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
+            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
+            'Throwable', 'Tie', 'TileObserver', 'Time',
+            'TimeLimitExceededException', 'Timer',
+            'TimerTask', 'Timestamp', 'TimeZone', 'TitledBorder',
+            'ToolBarUI', 'Toolkit', 'ToolTipManager',
+            'ToolTipUI', 'TooManyListenersException', 'Track',
+            'TransactionRequiredException',
+            'TransactionRolledbackException',
+            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
+            'Transferable', 'TransformAttribute', 'TRANSIENT',
+            'Transmitter', 'Transparency', 'TreeCellEditor',
+            'TreeCellRenderer', 'TreeExpansionEvent',
+            'TreeExpansionListener', 'TreeMap', 'TreeModel',
+            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
+            'TreePath', 'TreeSelectionEvent',
+            'TreeSelectionListener', 'TreeSelectionModel',
+            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
+            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
+            'Types', 'UID', 'UIDefaults',
+            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
+            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
+            'UIManager', 'UIManager.LookAndFeelInfo',
+            'UIResource', 'ULongLongSeqHelper',
+            'ULongLongSeqHolder', 'ULongSeqHelper',
+            'ULongSeqHolder', 'UndeclaredThrowableException',
+            'UndoableEdit', 'UndoableEditEvent',
+            'UndoableEditListener', 'UndoableEditSupport',
+            'UndoManager', 'UnexpectedException',
+            'UnicastRemoteObject', 'UnionMember',
+            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
+            'UnknownException', 'UnknownGroupException',
+            'UnknownHostException',
+            'UnknownObjectException', 'UnknownServiceException',
+            'UnknownUserException', 'UnmarshalException',
+            'UnrecoverableKeyException', 'Unreferenced',
+            'UnresolvedPermission', 'UnsatisfiedLinkError',
+            'UnsolicitedNotification',
+            'UnsolicitedNotificationEvent',
+            'UnsolicitedNotificationListener',
+            'UnsupportedAudioFileException',
+            'UnsupportedClassVersionError',
+            'UnsupportedEncodingException',
+            'UnsupportedFlavorException',
+            'UnsupportedLookAndFeelException',
+            'UnsupportedOperationException',
+            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
+            'URL', 'URLClassLoader', 'URLConnection',
+            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
+            'URLStreamHandlerFactory', 'UserException',
+            'UShortSeqHelper', 'UShortSeqHolder',
+            'UTFDataFormatException', 'Util', 'UtilDelegate',
+            'Utilities', 'ValueBase', 'ValueBaseHelper',
+            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
+            'ValueMember', 'ValueMemberHelper',
+            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
+            'VersionSpecHelper', 'VetoableChangeListener',
+            'VetoableChangeSupport', 'View', 'ViewFactory',
+            'ViewportLayout', 'ViewportUI',
+            'VirtualMachineError', 'Visibility',
+            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
+            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
+            'VoiceStatus', 'Void', 'WCharSeqHelper',
+            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
+            'Window', 'WindowAdapter', 'WindowConstants',
+            'WindowEvent', 'WindowListener', 'WrappedPlainView',
+            'WritableRaster', 'WritableRenderedImage',
+            'WriteAbortedException', 'Writer',
+            'WrongTransaction', 'WStringValueHelper',
+            'X509Certificate', 'X509CRL', 'X509CRLEntry',
+            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
+            'ZipException', 'ZipFile', 'ZipInputStream',
+            'ZipOutputStream', 'ZoneView',
+            '_BindingIteratorImplBase', '_BindingIteratorStub',
+            '_IDLTypeStub', '_NamingContextImplBase',
+            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
+        ),
+        4 => array(
+            'Double', 'Int', 'Boolean', 'Byte', 'Short', 'Long', 'Char', 'Float', 'Unit', 'Nothing', 'Any'
+        )
+    ),
     'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '*', '<', '>', '?', '!',
-        'it', ':', '=', '->', '..', '::',
-         '$', '@'
-        ),
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '&', '|', '^',
+        '<', '>', '=',
+        '?', ':', ';',
+    ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
         1 => true,
-        2 => true
-        ),
+        2 => true,
+        3 => true,
+        4 => true
+    ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #0000ff; font-weight: bold;',
-            2 => 'color: #9999cc; font-weight: bold;',
-            ),
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000066; font-weight: bold;',
+            3 => 'color: #003399;',
+            4 => 'color: #000066; font-weight: bold;'
+        ),
         'COMMENTS' => array(
-            1 => 'color: #008000; font-style: italic;',
-            2 => 'color: #CC66FF;',
-            'MULTI' => 'color: #00ff00; font-style: italic;'
-            ),
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #006699;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+        ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #6666ff; font-weight: bold;',
-            1 => 'color: #6666ff; font-weight: bold;',
-            2 => 'color: #5555ff; font-weight: bold;',
-            3 => 'color: #4444ff; font-weight: bold;',
-            4 => 'color: #3333ff; font-weight: bold;'
-            ),
+            0 => 'color: #000099; font-weight: bold;'
+        ),
         'BRACKETS' => array(
-            0 => 'color: #F78811;'
-            ),
+            0 => 'color: #009900;'
+        ),
         'STRINGS' => array(
-            0 => 'color: #6666FF;'
-            ),
+            0 => 'color: #0000ff;'
+        ),
         'NUMBERS' => array(
-            0 => 'color: #F78811;'
-            ),
+            0 => 'color: #cc66cc;'
+        ),
         'METHODS' => array(
-            1 => 'color: #000000;',
-            2 => 'color: #000000;'
-            ),
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+        ),
         'SYMBOLS' => array(
-            0 => 'color: #000080;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
+            0 => 'color: #339933;'
         ),
+        'SCRIPT' => array(),
+        'REGEXPS' => array()
+    ),
     'URLS' => array(
-        1 => 'https://kotlinlang.org/',
-        2 => ''
-        ),
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?hl=en&amp;q=allinurl%3Adocs.oracle.com+javase+docs+api+{FNAMEL}',
+        4 => ''
+    ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
         1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
+    ),
+    'REGEXPS' => array(),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
 );
-
-?>
diff --git a/htdocs/application/libraries/geshi/geshi/latex.php b/htdocs/application/libraries/geshi/geshi/latex.php
index 8b28e34..d03dde9 100644
--- a/htdocs/application/libraries/geshi/geshi/latex.php
+++ b/htdocs/application/libraries/geshi/geshi/latex.php
@@ -4,7 +4,7 @@
  * -----
  * Author: efi, Matthias Pospiech (matthias@pospiech.eu)
  * Copyright: (c) 2006 efi, Matthias Pospiech (matthias@pospiech.eu), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/09/23
  *
  * LaTeX language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/lb.php b/htdocs/application/libraries/geshi/geshi/lb.php
index aa3f5c0..6882ea8 100644
--- a/htdocs/application/libraries/geshi/geshi/lb.php
+++ b/htdocs/application/libraries/geshi/geshi/lb.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Chris Iverson (cj.no.one@gmail.com)
  * Copyright: (c) 2010 Chris Iverson
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/07/18
  *
  * Liberty BASIC language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ldif.php b/htdocs/application/libraries/geshi/geshi/ldif.php
index c413513..86be996 100644
--- a/htdocs/application/libraries/geshi/geshi/ldif.php
+++ b/htdocs/application/libraries/geshi/geshi/ldif.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Bruno Harbulot (Bruno.Harbulot@manchester.ac.uk)
  * Copyright: (c) 2005 deguix, (c) 2010 Bruno Harbulot
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/03/01
  *
  * LDIF language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/lisp.php b/htdocs/application/libraries/geshi/geshi/lisp.php
index a230191..9b3dbf8 100644
--- a/htdocs/application/libraries/geshi/geshi/lisp.php
+++ b/htdocs/application/libraries/geshi/geshi/lisp.php
@@ -4,14 +4,14 @@
  * --------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/30
  *
  * Generic Lisp language file for GeSHi.
  *
  * CHANGES
  * -------
- * 2013/11/13 (1.0.8.12)
+ * 2013/11/13 (1.0.8.13)
  *  -  Fixed bug where a keyword was highlighted in identifiers (Edward Hart)
  * 2005/12/9  (1.0.2)
  *  -  Added support for :keywords and ::access (Denis Mashkevich)
diff --git a/htdocs/application/libraries/geshi/geshi/llvm.php b/htdocs/application/libraries/geshi/geshi/llvm.php
index 4fc2040..ca375bb 100644
--- a/htdocs/application/libraries/geshi/geshi/llvm.php
+++ b/htdocs/application/libraries/geshi/geshi/llvm.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Benny Baumann (BenBE@geshi.org), Azriel Fasten (azriel.fasten@gmail.com)
  * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/), Azriel Fasten (azriel.fasten@gmail.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/10/14
  *
  * LLVM language file for GeSHi.
@@ -66,15 +66,15 @@ $language_data = array(
     GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         0 => array(
-            'to', 'nuw', 'nsw', 'align', 'inbounds', 'entry', 'return'
+            'to', 'nuw', 'nsw', 'inbounds', 'entry', 'return'
             ),
         //Terminator Instructions
         1 => array(
-            'ret', 'br', 'switch', 'indirectbr', 'invoke', 'unwind', 'unreachable'
+            'ret', 'br', 'switch', 'indirectbr', 'invoke', 'resume', 'catchswitch', 'catchret', 'cleanupret', 'unreachable'
             ),
         //Binary Operations
         2 => array(
-            'add', 'fadd', 'sub', 'fsub', 'mul', 'fmul', 'udiv', 'sdiv', 'fdiv', 'urem', 'frem', 'srem'
+            'add', 'fadd', 'sub', 'fsub', 'mul', 'fmul', 'udiv', 'sdiv', 'fdiv', 'urem', 'srem', 'frem'
             ),
         //Bitwise Binary Operations
         3 => array(
@@ -90,39 +90,44 @@ $language_data = array(
             ),
         //Memory Access and Addressing Operations
         6 => array(
-            'alloca', 'load', 'store', 'getelementptr'
+            'alloca', 'load', 'store', 'fence', 'cmpxchg', 'atomicrmw', 'getelementptr'
             ),
         //Conversion Operations
         7 => array(
-            'trunc', 'zext', 'sext', 'fptrunc', 'fpext', 'fptoui', 'fptosi',
-            'uitofp', 'sitofp', 'ptrtoint', 'inttoptr', 'bitcast'
+            'trunc', 'zext', 'sext', 'fptrunc', 'fpext', 'fptoui', 'fptosi', 'uitofp', 'sitofp',
+            'ptrtoint', 'inttoptr', 'bitcast', 'addrspacecast'
             ),
         //Other Operations
         8 => array(
-            'icmp', 'fcmp', 'phi', 'select', 'call', 'va_arg'
+            'icmp', 'fcmp', 'phi', 'select', 'call', 'va_arg', 'landingpad', 'catchpad', 'cleanuppad'
             ),
         //Linkage Types
         9 => array(
-            'private', 'linker_private', 'linker_private_weak', 'linker_private_weak_def_auto',
-            'internal', 'available_externally', 'linkonce', 'common', 'weak', 'appending',
-            'extern_weak', 'linkonce_odr', 'weak_odr', 'externally visible', 'dllimport', 'dllexport',
+            'private', 'internal', 'available_externally', 'linkonce', 'weak', 'common', 'appending',
+            'extern_weak', 'linkonce_odr', 'weak_odr', 'external'
             ),
         //Calling Conventions
         10 => array(
-            'ccc', 'fastcc', 'coldcc', 'cc 10'
+            'ccc', 'fastcc', 'coldcc', 'cc 10', 'cc 11', 'webkit_jscc', 'anyregcc', 'preserve_mostcc',
+            'preserve_allcc', 'cxx_fast_tlscc', 'swiftcc', 'cc'
             ),
-        //Named Types
+        //Structure Types
         11 => array(
             'type'
             ),
         //Parameter Attributes
         12 => array(
-            'zeroext', 'signext', 'inreg', 'byval', 'sret', 'noalias', 'nocapture', 'nest'
+            'zeroext', 'signext', 'inreg', 'byval', 'inalloca', 'sret', 'align', 'noalias', 'nocapture', 'nest',
+            'returned', 'nonnull', 'dereferenceable', 'dereferenceable_or_null', 'swiftself', 'swifterror'
             ),
         //Function Attributes
         13 => array(
-            'alignstack', 'alwaysinline', 'inlinehint', 'naked', 'noimplicitfloat', 'noinline', 'noredzone', 'noreturn',
-            'nounwind', 'optsize', 'readnone', 'readonly', 'ssp', 'sspreq',
+            'alignstack', 'allocsize', 'alwaysinline', 'builtin', 'cold', 'convergent', 'inaccessiblememonly',
+            'inaccessiblemem_or_argmemonly', 'inlinehint', 'jumptable', 'minsize', 'naked', 'nobuiltin', 'noduplicate',
+            'noimplicitfloat', 'noinline', 'nonlazybind', 'noredzone', 'noreturn', 'norecurse', 'nounwind',
+            'optnone', 'optsize', 'patchable-function', 'readnone', 'readonly', 'writeonly', 'argmemonly',
+            'returns_twice', 'safestack', 'sanitize_address', 'sanitize_memory', 'sanitize_thread', 'ssp',
+            'sspreq', 'sspstrong', 'thunk', 'uwtable'
             ),
         //Module-Level Inline Assembly
         14 => array(
@@ -132,9 +137,9 @@ $language_data = array(
         15 => array(
             'target datalayout'
             ),
-        //Primitive Types
+        //Type System
         16 => array(
-            'x86mmx',
+            'x86_mmx',
             'void',
             'label',
             'metadata',
@@ -142,13 +147,13 @@ $language_data = array(
             ),
         //Floating Point Types
         17 => array(
-            'float', 'double', 'fp128', 'x86_fp80', 'ppc_fp128',
+            'half', 'float', 'double', 'fp128', 'x86_fp80', 'ppc_fp128',
             ),
         //Simple Constants
         18 => array(
             'false', 'true', 'null'
             ),
-        //Global Variable and Function Addresses
+        //Global Variable
         19 => array(
             'global', 'addrspace', 'constant', 'section'
             ),
@@ -172,6 +177,7 @@ $language_data = array(
         24 => array(
             'default', 'hidden', 'protected'
             ),
+        //Volatile Memory Accesses
         25 => array(
             'volatile'
             ),
@@ -304,32 +310,32 @@ $language_data = array(
         ),
     'URLS' => array(
         0 => '',
-        1 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        2 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        3 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        4 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        5 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        6 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        7 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        8 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        9 => 'http://llvm.org/docs/LangRef.html#linkage_{FNAME}',
-        10 => 'http://llvm.org/docs/LangRef.html#callingconv',
-        11 => 'http://llvm.org/docs/LangRef.html#namedtypes',
-        12 => 'http://llvm.org/docs/LangRef.html#paramattrs',
-        13 => 'http://llvm.org/docs/LangRef.html#fnattrs',
-        14 => 'http://llvm.org/docs/LangRef.html#moduleasm',
-        15 => 'http://llvm.org/docs/LangRef.html#datalayout',
-        16 => 'http://llvm.org/docs/LangRef.html#t_{FNAME}',
-        17 => 'http://llvm.org/docs/LangRef.html#t_floating',
-        18 => 'http://llvm.org/docs/LangRef.html#simpleconstants',
-        19 => 'http://llvm.org/docs/LangRef.html#globalvars',
-        20 => 'http://llvm.org/docs/LangRef.html#functionstructure',
-        21 => 'http://llvm.org/docs/LangRef.html#complexconstants',
-        22 => 'http://llvm.org/docs/LangRef.html#undefvalues',
-        23 => 'http://llvm.org/docs/LangRef.html#blockaddress',
-        24 => 'http://llvm.org/docs/LangRef.html#visibility',
-        25 => 'http://llvm.org/docs/LangRef.html#volatile',
-        26 => 'http://llvm.org/docs/LangRef.html#i_call',
+        1 => 'http://llvm.org/docs/LangRef.html#{FNAME}-instruction',
+        2 => 'http://llvm.org/docs/LangRef.html#{FNAME}-instruction',
+        3 => 'http://llvm.org/docs/LangRef.html#{FNAME}-instruction',
+        4 => 'http://llvm.org/docs/LangRef.html#{FNAME}-instruction',
+        5 => 'http://llvm.org/docs/LangRef.html#{FNAME}-instruction',
+        6 => 'http://llvm.org/docs/LangRef.html#{FNAME}-instruction',
+        7 => 'http://llvm.org/docs/LangRef.html#{FNAME}-instruction',
+        8 => 'http://llvm.org/docs/LangRef.html#{FNAME}-instruction',
+        9 => 'http://llvm.org/docs/LangRef.html#linkage-types',
+        10 => 'http://llvm.org/docs/LangRef.html#calling-conventions',
+        11 => 'http://llvm.org/docs/LangRef.html#opaque-structure-types',
+        12 => 'http://llvm.org/docs/LangRef.html#parameter-attributes',
+        13 => 'http://llvm.org/docs/LangRef.html#function-attributes',
+        14 => 'http://llvm.org/docs/LangRef.html#module-level-inline-assembly',
+        15 => 'http://llvm.org/docs/LangRef.html#data-layout',
+        16 => 'http://llvm.org/docs/LangRef.html#type-system',
+        17 => 'http://llvm.org/docs/LangRef.html#floating-point-types',
+        18 => 'http://llvm.org/docs/LangRef.html#simple-constants',
+        19 => 'http://llvm.org/docs/LangRef.html#global-variables',
+        20 => 'http://llvm.org/docs/LangRef.html#functions',
+        21 => 'http://llvm.org/docs/LangRef.html#complex-constants',
+        22 => 'http://llvm.org/docs/LangRef.html#undefined-values',
+        23 => 'http://llvm.org/docs/LangRef.html#addresses-of-basic-blocks',
+        24 => 'http://llvm.org/docs/LangRef.html#visibility-styles',
+        25 => 'http://llvm.org/docs/LangRef.html#volatile-memory-accesses',
+        26 => 'http://llvm.org/docs/LangRef.html#call-instruction',
         ),
     'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(
diff --git a/htdocs/application/libraries/geshi/geshi/locobasic.php b/htdocs/application/libraries/geshi/geshi/locobasic.php
index 686bb6c..596cb12 100644
--- a/htdocs/application/libraries/geshi/geshi/locobasic.php
+++ b/htdocs/application/libraries/geshi/geshi/locobasic.php
@@ -4,7 +4,7 @@
  * -------------
  * Author: Nacho Cabanes
  * Copyright: (c) 2009 Nacho Cabanes (http://www.nachocabanes.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/03/22
  *
  * Locomotive Basic (Amstrad CPC series) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/logtalk.php b/htdocs/application/libraries/geshi/geshi/logtalk.php
index c72e548..a3ed129 100644
--- a/htdocs/application/libraries/geshi/geshi/logtalk.php
+++ b/htdocs/application/libraries/geshi/geshi/logtalk.php
@@ -5,7 +5,7 @@
  *
  * Author: Paulo Moura (pmoura@logtalk.org)
  * Copyright: (c) 2009-2011 Paulo Moura (http://logtalk.org/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/10/24
  *
  * Logtalk language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/lolcode.php b/htdocs/application/libraries/geshi/geshi/lolcode.php
index 3dee092..39cae20 100644
--- a/htdocs/application/libraries/geshi/geshi/lolcode.php
+++ b/htdocs/application/libraries/geshi/geshi/lolcode.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/10/31
  *
  * LOLcode language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/lotusformulas.php b/htdocs/application/libraries/geshi/geshi/lotusformulas.php
index e94f5df..4f1c678 100644
--- a/htdocs/application/libraries/geshi/geshi/lotusformulas.php
+++ b/htdocs/application/libraries/geshi/geshi/lotusformulas.php
@@ -4,7 +4,7 @@
  * ------------------------
  * Author: Richard Civil (info@richardcivil.net)
  * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/04/12
  *
  * @Formula/@Command language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/lotusscript.php b/htdocs/application/libraries/geshi/geshi/lotusscript.php
index e5a8971..069e603 100644
--- a/htdocs/application/libraries/geshi/geshi/lotusscript.php
+++ b/htdocs/application/libraries/geshi/geshi/lotusscript.php
@@ -4,7 +4,7 @@
  * ------------------------
  * Author: Richard Civil (info@richardcivil.net)
  * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/04/12
  *
  * LotusScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/lscript.php b/htdocs/application/libraries/geshi/geshi/lscript.php
index acfd18e..432d54a 100644
--- a/htdocs/application/libraries/geshi/geshi/lscript.php
+++ b/htdocs/application/libraries/geshi/geshi/lscript.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: Arendedwinter (admin@arendedwinter.com)
  * Copyright: (c) 2008 Beau McGuigan (http://www.arendedwinter.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 15/11/2008
  *
  * Lightwave Script language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/lsl2.php b/htdocs/application/libraries/geshi/geshi/lsl2.php
index 1bbf1c0..608b5e1 100644
--- a/htdocs/application/libraries/geshi/geshi/lsl2.php
+++ b/htdocs/application/libraries/geshi/geshi/lsl2.php
@@ -4,7 +4,7 @@
  * --------
  * Author: William Fry (william.fry@nyu.edu)
  * Copyright: (c) 2009 William Fry
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/02/04
  *
  * Linden Scripting Language (LSL2) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/lua.php b/htdocs/application/libraries/geshi/geshi/lua.php
index f82ce3c..313bbb5 100644
--- a/htdocs/application/libraries/geshi/geshi/lua.php
+++ b/htdocs/application/libraries/geshi/geshi/lua.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/10
  *
  * LUA language file for GeSHi.
@@ -46,7 +46,7 @@ $language_data = array (
     'LANG_NAME' => 'Lua',
     'COMMENT_SINGLE' => array(1 => "--"),
     'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(1 => '/--\[(=*)\[.*\]\1\]/s'),
+    'COMMENT_REGEXP' => array(1 => '/--\[(=*)\[.*?\]\1\]/s'),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
     'ESCAPE_CHAR' => '',
diff --git a/htdocs/application/libraries/geshi/geshi/m68k.php b/htdocs/application/libraries/geshi/geshi/m68k.php
index aff1994..e2040a6 100644
--- a/htdocs/application/libraries/geshi/geshi/m68k.php
+++ b/htdocs/application/libraries/geshi/geshi/m68k.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2007 Benny Baumann (http://www.omorphia.de/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/02/06
  *
  * Motorola 68000 Assembler language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/magiksf.php b/htdocs/application/libraries/geshi/geshi/magiksf.php
index 74e794e..154cd26 100644
--- a/htdocs/application/libraries/geshi/geshi/magiksf.php
+++ b/htdocs/application/libraries/geshi/geshi/magiksf.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Sjoerd van Leent (svanleent@gmail.com)
  * Copyright: (c) 2010 Sjoerd van Leent
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/02/15
  *
  * MagikSF language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/make.php b/htdocs/application/libraries/geshi/geshi/make.php
index 4567dab..fa3193e 100644
--- a/htdocs/application/libraries/geshi/geshi/make.php
+++ b/htdocs/application/libraries/geshi/geshi/make.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Neil Bird <phoenix@fnxweb.com>
  * Copyright: (c) 2008 Neil Bird
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/08/26
  *
  * make language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/mapbasic.php b/htdocs/application/libraries/geshi/geshi/mapbasic.php
index 2672eb7..d85e574 100644
--- a/htdocs/application/libraries/geshi/geshi/mapbasic.php
+++ b/htdocs/application/libraries/geshi/geshi/mapbasic.php
@@ -4,7 +4,7 @@
  * ------
  * Author: Tomasz Berus (t.berus@gisodkuchni.pl)
  * Copyright: (c) 2009 Tomasz Berus (http://sourceforge.net/projects/mbsyntax/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/11/25
  *
  * MapBasic language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/mathematica.php b/htdocs/application/libraries/geshi/geshi/mathematica.php
new file mode 100644
index 0000000..77d8653
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/mathematica.php
@@ -0,0 +1,5035 @@
+<?php
+/*************************************************************************************
+ * mathematica.php
+ * --------
+ * Author: Connor Glosser (glosser1@gmail.com)
+ * Copyright: (c) 2014 Connor Glosser (http://www.msu.edu/~glosser1)
+ * Release Version: 1.0.9.0
+ * Date Started: 2014/08/11
+ *
+ * Mathematica language file for GeSHi.
+ *
+ * COMMENTS
+ * --------
+ * Mathematica itself uses a lot of hyper-contextual syntax highlighting
+ * that doesn't work well outside of their proprietary Notebook interface.
+ * Consequently, external syntax highlighting tends to get noisy quickly.
+ * Here, I've tried to create a triadic color scheme to distinguish keywords,
+ * infix functions, and $-designated variables.
+ *
+ * CHANGES
+ * -------
+ * 2016/10/27 (1.0.8.13)
+ *  - Update function list to Ver. 11
+ *  - Add delimiters for associative arrays
+ * 2014/10/13 (1.0.8.11)
+ *  - Removed style variables for compatability
+ * 2014/08/11 (1.0.8.11)
+ *  - First Release
+ *  - Symbols taken from http://reference.wolfram.com/language/guide/AlphabeticalListing.html
+ *    (Mathematica Version 10)
+ *
+ * TODO (updated 2014/08/12)
+ * -------------------------
+ * - evaluate colored array syntax
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+//"Base" styles
+//string     = 'color: #666666; font-style: italic;';
+//comment    = 'color: #999999; font-style: italic;';
+
+//Purple-green colors
+//primary    = 'color: #500D75; font-weight: bold;'; //keywords
+//secondary  = 'color: #70A30A; font-weight: bold;'; //infix functions
+//tertiary   = 'color: #8C0953; font-weight: bold;'; //$variables
+//quaternary = 'color: #AFAF0B; font-weight: bold;'; //potentially array syntax in the future
+
+//Orange-blue colors (similar to python coloring)
+//primary    = 'color: #FF7700; font-weight: bold;'; //keywords
+//secondary  = 'color: #133CAC; font-weight: bold;'; //infix functions
+//tertiary   = 'color: #028E9B; font-weight: bold;'; //$variables
+//quaternary = 'color: #FFAD00; font-weight: bold;'; //potentially array syntax in the future
+
+$language_data = array(
+    'LANG_NAME' => 'Mathematica',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(
+        '(*' => '*)',
+    ),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(
+        1 => '"',
+    ),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(),
+    'HARDQUOTE' => array(),
+    'HARDESCAPE' => array(),
+    'HARDCHAR' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'AASTriangle',
+            'APIFunction',
+            'ARCHProcess',
+            'ARIMAProcess',
+            'ARMAProcess',
+            'ARProcess',
+            'ASATriangle',
+            'AbelianGroup',
+            'Abort',
+            'AbortKernels',
+            'AbortProtect',
+            'AbortScheduledTask',
+            'Above',
+            'Abs',
+            'AbsArg',
+            'AbsoluteCorrelation',
+            'AbsoluteCorrelationFunction',
+            'AbsoluteCurrentValue',
+            'AbsoluteDashing',
+            'AbsoluteFileName',
+            'AbsoluteOptions',
+            'AbsolutePointSize',
+            'AbsoluteThickness',
+            'AbsoluteTime',
+            'AbsoluteTiming',
+            'AccountingForm',
+            'Accumulate',
+            'Accuracy',
+            'AccuracyGoal',
+            'ActionMenu',
+            'Activate',
+            'ActiveStyle',
+            'AcyclicGraphQ',
+            'AddTo',
+            'AddUsers',
+            'AdjacencyGraph',
+            'AdjacencyList',
+            'AdjacencyMatrix',
+            'AdjustTimeSeriesForecast',
+            'AdjustmentBox',
+            'AdjustmentBoxOptions',
+            'AdministrativeDivisionData',
+            'AffineHalfSpace',
+            'AffineSpace',
+            'AffineStateSpaceModel',
+            'AffineTransform',
+            'After',
+            'AirPressureData',
+            'AirTemperatureData',
+            'AircraftData',
+            'AirportData',
+            'AiryAi',
+            'AiryAiPrime',
+            'AiryAiZero',
+            'AiryBi',
+            'AiryBiPrime',
+            'AiryBiZero',
+            'AlgebraicIntegerQ',
+            'AlgebraicNumber',
+            'AlgebraicNumberDenominator',
+            'AlgebraicNumberNorm',
+            'AlgebraicNumberPolynomial',
+            'AlgebraicNumberTrace',
+            'AlgebraicUnitQ',
+            'Algebraics',
+            'Alignment',
+            'AlignmentPoint',
+            'All',
+            'AllTrue',
+            'AllowGroupClose',
+            'AllowInlineCells',
+            'AllowLooseGrammar',
+            'AllowReverseGroupClose',
+            'AllowedDimensions',
+            'AlphaChannel',
+            'Alphabet',
+            'AlphabeticOrder',
+            'AlphabeticSort',
+            'AlternateImage',
+            'AlternatingFactorial',
+            'AlternatingGroup',
+            'AlternativeHypothesis',
+            'Alternatives',
+            'AltitudeMethod',
+            'AmbiguityFunction',
+            'AmbiguityList',
+            'AnatomyData',
+            'AnatomyForm',
+            'AnatomyPlot3D',
+            'AnchoredSearch',
+            'And',
+            'AndersonDarlingTest',
+            'AngerJ',
+            'AngleBracket',
+            'AnglePath',
+            'AngleVector',
+            'AngularGauge',
+            'Animate',
+            'AnimationDirection',
+            'AnimationRate',
+            'AnimationRepetitions',
+            'AnimationRunTime',
+            'AnimationRunning',
+            'AnimationTimeIndex',
+            'Animator',
+            'Annotation',
+            'Annuity',
+            'AnnuityDue',
+            'Annulus',
+            'Anonymous',
+            'Antialiasing',
+            'AntihermitianMatrixQ',
+            'Antisymmetric',
+            'AntisymmetricMatrixQ',
+            'AnyOrder',
+            'AnySubset',
+            'AnyTrue',
+            'Apart',
+            'ApartSquareFree',
+            'Appearance',
+            'AppearanceElements',
+            'AppearanceRules',
+            'AppellF1',
+            'Append',
+            'AppendTo',
+            'Apply',
+            'ArcCos',
+            'ArcCosh',
+            'ArcCot',
+            'ArcCoth',
+            'ArcCsc',
+            'ArcCsch',
+            'ArcCurvature',
+            'ArcLength',
+            'ArcSec',
+            'ArcSech',
+            'ArcSin',
+            'ArcSinDistribution',
+            'ArcSinh',
+            'ArcTan',
+            'ArcTanh',
+            'Area',
+            'Arg',
+            'ArgMax',
+            'ArgMin',
+            'ArithmeticGeometricMean',
+            'Array',
+            'ArrayComponents',
+            'ArrayDepth',
+            'ArrayFilter',
+            'ArrayFlatten',
+            'ArrayMesh',
+            'ArrayPad',
+            'ArrayPlot',
+            'ArrayQ',
+            'ArrayResample',
+            'ArrayReshape',
+            'ArrayRules',
+            'Arrays',
+            'Arrow',
+            'Arrowheads',
+            'Ask',
+            'AskAppend',
+            'AskConfirm',
+            'AskDisplay',
+            'AskFunction',
+            'AskTemplateDisplay',
+            'AskedQ',
+            'AskedValue',
+            'AspectRatio',
+            'Assert',
+            'AssociateTo',
+            'Association',
+            'AssociationFormat',
+            'AssociationMap',
+            'AssociationQ',
+            'AssociationThread',
+            'AssumeDeterministic',
+            'Assuming',
+            'Assumptions',
+            'AsymptoticOutputTracker',
+            'Asynchronous',
+            'AsynchronousTaskObject',
+            'AsynchronousTasks',
+            'AtomQ',
+            'Attributes',
+            'Audio',
+            'AudioAmplify',
+            'AudioBlockMap',
+            'AudioChannelCombine',
+            'AudioChannelMix',
+            'AudioChannelSeparate',
+            'AudioChannels',
+            'AudioData',
+            'AudioDelay',
+            'AudioDelete',
+            'AudioDevice',
+            'AudioFade',
+            'AudioFrequencyShift',
+            'AudioGenerator',
+            'AudioIntervals',
+            'AudioJoin',
+            'AudioLabel',
+            'AudioLength',
+            'AudioLocalMeasurements',
+            'AudioMeasurements',
+            'AudioNormalize',
+            'AudioOverlay',
+            'AudioPad',
+            'AudioPan',
+            'AudioPartition',
+            'AudioPitchShift',
+            'AudioPlot',
+            'AudioQ',
+            'AudioResample',
+            'AudioReverb',
+            'AudioSampleRate',
+            'AudioSplit',
+            'AudioTimeStretch',
+            'AudioTrim',
+            'AudioType',
+            'AugmentedSymmetricPolynomial',
+            'Authentication',
+            'AutoAction',
+            'AutoDelete',
+            'AutoIndent',
+            'AutoItalicWords',
+            'AutoMultiplicationSymbol',
+            'AutoRefreshed',
+            'AutoRemove',
+            'AutoScroll',
+            'AutoSpacing',
+            'AutoSubmitting',
+            'Autocomplete',
+            'AutocompletionFunction',
+            'AutocorrelationTest',
+            'Automatic',
+            'AutorunSequencing',
+            'Axes',
+            'AxesEdge',
+            'AxesLabel',
+            'AxesOrigin',
+            'AxesStyle',
+            'Axis',
+            'BSplineBasis',
+            'BSplineCurve',
+            'BSplineFunction',
+            'BSplineSurface',
+            'BabyMonsterGroupB',
+            'Back',
+            'Background',
+            'Backslash',
+            'Backward',
+            'Ball',
+            'Band',
+            'BandpassFilter',
+            'BandstopFilter',
+            'BarChart',
+            'BarChart3D',
+            'BarLegend',
+            'BarOrigin',
+            'BarSpacing',
+            'BarabasiAlbertGraphDistribution',
+            'BarcodeImage',
+            'BarcodeRecognize',
+            'BaringhausHenzeTest',
+            'BarlowProschanImportance',
+            'BarnesG',
+            'BartlettHannWindow',
+            'BartlettWindow',
+            'BaseForm',
+            'BaseStyle',
+            'Baseline',
+            'BaselinePosition',
+            'BatchNormalizationLayer',
+            'BatchSize',
+            'BatesDistribution',
+            'BattleLemarieWavelet',
+            'BayesianMaximization',
+            'BayesianMaximizationObject',
+            'BayesianMinimization',
+            'BayesianMinimizationObject',
+            'Because',
+            'BeckmannDistribution',
+            'Beep',
+            'Before',
+            'Begin',
+            'BeginDialogPacket',
+            'BeginPackage',
+            'BellB',
+            'BellY',
+            'Below',
+            'BenfordDistribution',
+            'BeniniDistribution',
+            'BenktanderGibratDistribution',
+            'BenktanderWeibullDistribution',
+            'BernoulliB',
+            'BernoulliDistribution',
+            'BernoulliGraphDistribution',
+            'BernoulliProcess',
+            'BernsteinBasis',
+            'BesselFilterModel',
+            'BesselI',
+            'BesselJ',
+            'BesselJZero',
+            'BesselK',
+            'BesselY',
+            'BesselYZero',
+            'Beta',
+            'BetaBinomialDistribution',
+            'BetaDistribution',
+            'BetaNegativeBinomialDistribution',
+            'BetaPrimeDistribution',
+            'BetaRegularized',
+            'Between',
+            'BetweennessCentrality',
+            'BezierCurve',
+            'BezierFunction',
+            'BilateralFilter',
+            'BinCounts',
+            'BinLists',
+            'Binarize',
+            'BinaryDistance',
+            'BinaryFormat',
+            'BinaryImageQ',
+            'BinaryRead',
+            'BinaryReadList',
+            'BinaryWrite',
+            'Binomial',
+            'BinomialDistribution',
+            'BinomialProcess',
+            'BinormalDistribution',
+            'BiorthogonalSplineWavelet',
+            'BipartiteGraphQ',
+            'BiquadraticFilterModel',
+            'BirnbaumImportance',
+            'BirnbaumSaundersDistribution',
+            'BitAnd',
+            'BitClear',
+            'BitGet',
+            'BitLength',
+            'BitNot',
+            'BitOr',
+            'BitSet',
+            'BitShiftLeft',
+            'BitShiftRight',
+            'BitXor',
+            'Black',
+            'BlackmanHarrisWindow',
+            'BlackmanNuttallWindow',
+            'BlackmanWindow',
+            'Blank',
+            'BlankNullSequence',
+            'BlankSequence',
+            'Blend',
+            'Block',
+            'BlockMap',
+            'BlockRandom',
+            'BlomqvistBeta',
+            'BlomqvistBetaTest',
+            'Blue',
+            'Blur',
+            'BodePlot',
+            'BohmanWindow',
+            'Bold',
+            'Bookmarks',
+            'Boole',
+            'BooleanConsecutiveFunction',
+            'BooleanConvert',
+            'BooleanCountingFunction',
+            'BooleanFunction',
+            'BooleanGraph',
+            'BooleanMaxterms',
+            'BooleanMinimize',
+            'BooleanMinterms',
+            'BooleanQ',
+            'BooleanRegion',
+            'BooleanStrings',
+            'BooleanTable',
+            'BooleanVariables',
+            'Booleans',
+            'BorderDimensions',
+            'BorelTannerDistribution',
+            'Bottom',
+            'BottomHatTransform',
+            'BoundaryDiscretizeGraphics',
+            'BoundaryDiscretizeRegion',
+            'BoundaryMesh',
+            'BoundaryMeshRegion',
+            'BoundaryMeshRegionQ',
+            'BoundaryStyle',
+            'BoundedRegionQ',
+            'BoundingRegion',
+            'BoxData',
+            'BoxMatrix',
+            'BoxObject',
+            'BoxRatios',
+            'BoxStyle',
+            'BoxWhiskerChart',
+            'Boxed',
+            'BracketingBar',
+            'BrayCurtisDistance',
+            'BreadthFirstScan',
+            'Break',
+            'BridgeData',
+            'BroadcastStationData',
+            'Brown',
+            'BrownForsytheTest',
+            'BrownianBridgeProcess',
+            'BubbleChart',
+            'BubbleChart3D',
+            'BubbleScale',
+            'BubbleSizes',
+            'BuildingData',
+            'BulletGauge',
+            'BusinessDayQ',
+            'ButterflyGraph',
+            'ButterworthFilterModel',
+            'Button',
+            'ButtonBar',
+            'ButtonBox',
+            'ButtonBoxOptions',
+            'ButtonData',
+            'ButtonFunction',
+            'ButtonMinHeight',
+            'ButtonNotebook',
+            'ButtonSource',
+            'Byte',
+            'ByteArray',
+            'ByteArrayQ',
+            'ByteCount',
+            'ByteOrdering',
+
+            'C',
+            'CDF',
+            'CDFDeploy',
+            'CDFInformation',
+            'CDFWavelet',
+            'CForm',
+            'CMYKColor',
+            'CachePersistence',
+            'CalendarConvert',
+            'CalendarData',
+            'CalendarType',
+            'CallPacket',
+            'Callout',
+            'CalloutMarker',
+            'CalloutStyle',
+            'CanberraDistance',
+            'Cancel',
+            'CancelButton',
+            'CandlestickChart',
+            'CanonicalGraph',
+            'CanonicalName',
+            'CanonicalWarpingCorrespondence',
+            'CanonicalWarpingDistance',
+            'CantorStaircase',
+            'Cap',
+            'CapForm',
+            'CapitalDifferentialD',
+            'Capitalize',
+            'CapsuleShape',
+            'CarlemanLinearize',
+            'CarmichaelLambda',
+            'CaseOrdering',
+            'CaseSensitive',
+            'Cases',
+            'Cashflow',
+            'Casoratian',
+            'Catalan',
+            'CatalanNumber',
+            'Catch',
+            'Catenate',
+            'CatenateLayer',
+            'CauchyDistribution',
+            'CauchyWindow',
+            'CayleyGraph',
+            'Ceiling',
+            'CelestialSystem',
+            'Cell',
+            'CellAutoOverwrite',
+            'CellBaseline',
+            'CellBracketOptions',
+            'CellChangeTimes',
+            'CellContext',
+            'CellDingbat',
+            'CellDynamicExpression',
+            'CellEditDuplicate',
+            'CellEpilog',
+            'CellEvaluationDuplicate',
+            'CellEvaluationFunction',
+            'CellEventActions',
+            'CellFrame',
+            'CellFrameColor',
+            'CellFrameLabelMargins',
+            'CellFrameLabels',
+            'CellFrameMargins',
+            'CellGroup',
+            'CellGroupData',
+            'CellGrouping',
+            'CellID',
+            'CellLabel',
+            'CellLabelAutoDelete',
+            'CellMargins',
+            'CellObject',
+            'CellOpen',
+            'CellPrint',
+            'CellProlog',
+            'CellStyle',
+            'CellTags',
+            'Cells',
+            'CellularAutomaton',
+            'CensoredDistribution',
+            'Censoring',
+            'Center',
+            'CenterArray',
+            'CenterDot',
+            'CentralMoment',
+            'CentralMomentGeneratingFunction',
+            'ChampernowneNumber',
+            'ChanVeseBinarize',
+            'ChannelBase',
+            'ChannelDatabin',
+            'ChannelListen',
+            'ChannelListener',
+            'ChannelListeners',
+            'ChannelObject',
+            'ChannelPreSendFunction',
+            'ChannelSend',
+            'ChannelSubscribers',
+            'Character',
+            'CharacterCounts',
+            'CharacterEncoding',
+            'CharacterName',
+            'CharacterRange',
+            'CharacteristicFunction',
+            'CharacteristicPolynomial',
+            'Characters',
+            'ChartBaseStyle',
+            'ChartElementFunction',
+            'ChartElements',
+            'ChartLabels',
+            'ChartLayout',
+            'ChartLegends',
+            'ChartStyle',
+            'Chebyshev1FilterModel',
+            'Chebyshev2FilterModel',
+            'ChebyshevT',
+            'ChebyshevU',
+            'Check',
+            'CheckAbort',
+            'Checkbox',
+            'CheckboxBar',
+            'ChemicalData',
+            'ChessboardDistance',
+            'ChiDistribution',
+            'ChiSquareDistribution',
+            'ChineseRemainder',
+            'ChoiceButtons',
+            'ChoiceDialog',
+            'CholeskyDecomposition',
+            'Chop',
+            'ChromaticPolynomial',
+            'ChromaticityPlot',
+            'ChromaticityPlot3D',
+            'Circle',
+            'CircleDot',
+            'CircleMinus',
+            'CirclePlus',
+            'CirclePoints',
+            'CircleTimes',
+            'CirculantGraph',
+            'CircularOrthogonalMatrixDistribution',
+            'CircularQuaternionMatrixDistribution',
+            'CircularRealMatrixDistribution',
+            'CircularSymplecticMatrixDistribution',
+            'CircularUnitaryMatrixDistribution',
+            'Circumsphere',
+            'CityData',
+            'ClassPriors',
+            'ClassifierFunction',
+            'ClassifierInformation',
+            'ClassifierMeasurements',
+            'ClassifierMeasurementsObject',
+            'Classify',
+            'Clear',
+            'ClearAll',
+            'ClearAttributes',
+            'ClearCookies',
+            'ClearPermissions',
+            'ClearSystemCache',
+            'ClebschGordan',
+            'ClickPane',
+            'Clip',
+            'ClipPlanes',
+            'ClipPlanesStyle',
+            'ClipRange',
+            'ClippingStyle',
+            'Clock',
+            'ClockGauge',
+            'Close',
+            'CloseKernels',
+            'ClosenessCentrality',
+            'Closing',
+            'CloudAccountData',
+            'CloudBase',
+            'CloudConnect',
+            'CloudDeploy',
+            'CloudDirectory',
+            'CloudDisconnect',
+            'CloudEvaluate',
+            'CloudExport',
+            'CloudExpression',
+            'CloudExpressions',
+            'CloudFunction',
+            'CloudGet',
+            'CloudImport',
+            'CloudLoggingData',
+            'CloudObject',
+            'CloudObjects',
+            'CloudPublish',
+            'CloudPut',
+            'CloudSave',
+            'CloudShare',
+            'CloudSubmit',
+            'CloudSymbol',
+            'ClusterClassify',
+            'ClusterDissimilarityFunction',
+            'ClusteringComponents',
+            'ClusteringTree',
+            'CodeAssistOptions',
+            'Coefficient',
+            'CoefficientArrays',
+            'CoefficientList',
+            'CoefficientRules',
+            'CoifletWavelet',
+            'Collect',
+            'Colon',
+            'ColorBalance',
+            'ColorCombine',
+            'ColorConvert',
+            'ColorCoverage',
+            'ColorData',
+            'ColorDataFunction',
+            'ColorDistance',
+            'ColorFunction',
+            'ColorFunctionScaling',
+            'ColorNegate',
+            'ColorProfileData',
+            'ColorQ',
+            'ColorQuantize',
+            'ColorReplace',
+            'ColorRules',
+            'ColorSeparate',
+            'ColorSetter',
+            'ColorSlider',
+            'ColorSpace',
+            'ColorToneMapping',
+            'Colorize',
+            'Column',
+            'ColumnAlignments',
+            'ColumnLines',
+            'ColumnSpacings',
+            'ColumnWidths',
+            'ColumnsEqual',
+            'CombinerFunction',
+            'CometData',
+            'CommonName',
+            'CommonUnits',
+            'Commonest',
+            'CommonestFilter',
+            'CommunityBoundaryStyle',
+            'CommunityGraphPlot',
+            'CommunityLabels',
+            'CommunityRegionStyle',
+            'CompanyData',
+            'CompatibleUnitQ',
+            'CompilationOptions',
+            'CompilationTarget',
+            'Compile',
+            'Compiled',
+            'CompiledFunction',
+            'Complement',
+            'CompleteGraph',
+            'CompleteGraphQ',
+            'CompleteKaryTree',
+            'Complex',
+            'ComplexExpand',
+            'ComplexInfinity',
+            'Complexes',
+            'ComplexityFunction',
+            'ComponentMeasurements',
+            'ComposeList',
+            'ComposeSeries',
+            'CompositeQ',
+            'Composition',
+            'CompoundElement',
+            'CompoundExpression',
+            'CompoundPoissonDistribution',
+            'CompoundPoissonProcess',
+            'CompoundRenewalProcess',
+            'Compress',
+            'Condition',
+            'ConditionalExpression',
+            'Conditioned',
+            'Cone',
+            'ConfidenceLevel',
+            'ConfidenceRange',
+            'ConfidenceTransform',
+            'ConformAudio',
+            'ConformImages',
+            'Congruent',
+            'ConicHullRegion',
+            'Conjugate',
+            'ConjugateTranspose',
+            'Conjunction',
+            'ConnectLibraryCallbackFunction',
+            'ConnectedComponents',
+            'ConnectedGraphComponents',
+            'ConnectedGraphQ',
+            'ConnectedMeshComponents',
+            'ConnesWindow',
+            'ConoverTest',
+            'Constant',
+            'ConstantArray',
+            'ConstantImage',
+            'ConstantRegionQ',
+            'Constants',
+            'ConstellationData',
+            'Containing',
+            'ContainsAll',
+            'ContainsAny',
+            'ContainsExactly',
+            'ContainsNone',
+            'ContainsOnly',
+            'ContentFieldOptions',
+            'ContentLocationFunction',
+            'ContentObject',
+            'ContentPadding',
+            'ContentSelectable',
+            'ContentSize',
+            'Context',
+            'ContextToFileName',
+            'Contexts',
+            'Continue',
+            'ContinuedFraction',
+            'ContinuedFractionK',
+            'ContinuousAction',
+            'ContinuousMarkovProcess',
+            'ContinuousTask',
+            'ContinuousTimeModelQ',
+            'ContinuousWaveletData',
+            'ContinuousWaveletTransform',
+            'ContourDetect',
+            'ContourLabels',
+            'ContourPlot',
+            'ContourPlot3D',
+            'ContourShading',
+            'ContourStyle',
+            'Contours',
+            'ContraharmonicMean',
+            'Control',
+            'ControlActive',
+            'ControlPlacement',
+            'ControlType',
+            'ControllabilityGramian',
+            'ControllabilityMatrix',
+            'ControllableDecomposition',
+            'ControllableModelQ',
+            'ControllerInformation',
+            'ControllerLinking',
+            'ControllerManipulate',
+            'ControllerMethod',
+            'ControllerPath',
+            'ControllerState',
+            'ControlsRendering',
+            'Convergents',
+            'ConversionRules',
+            'ConvexHullMesh',
+            'ConvolutionLayer',
+            'Convolve',
+            'ConwayGroupCo1',
+            'ConwayGroupCo2',
+            'ConwayGroupCo3',
+            'CookieFunction',
+            'CoordinateBoundingBox',
+            'CoordinateBoundingBoxArray',
+            'CoordinateBounds',
+            'CoordinateBoundsArray',
+            'CoordinateChartData',
+            'CoordinateTransform',
+            'CoordinateTransformData',
+            'CoordinatesToolOptions',
+            'CoprimeQ',
+            'Coproduct',
+            'CopulaDistribution',
+            'CopyDatabin',
+            'CopyDirectory',
+            'CopyFile',
+            'CopyToClipboard',
+            'Copyable',
+            'CornerFilter',
+            'CornerNeighbors',
+            'Correlation',
+            'CorrelationDistance',
+            'CorrelationFunction',
+            'CorrelationTest',
+            'Cos',
+            'CosIntegral',
+            'Cosh',
+            'CoshIntegral',
+            'CosineDistance',
+            'CosineWindow',
+            'Cot',
+            'Coth',
+            'Count',
+            'CountDistinct',
+            'CountDistinctBy',
+            'CountRoots',
+            'CountryData',
+            'Counts',
+            'CountsBy',
+            'Covariance',
+            'CovarianceEstimatorFunction',
+            'CovarianceFunction',
+            'CoxIngersollRossProcess',
+            'CoxModel',
+            'CoxModelFit',
+            'CoxianDistribution',
+            'CramerVonMisesTest',
+            'CreateArchive',
+            'CreateCellID',
+            'CreateChannel',
+            'CreateCloudExpression',
+            'CreateDatabin',
+            'CreateDialog',
+            'CreateDirectory',
+            'CreateDocument',
+            'CreateFile',
+            'CreateIntermediateDirectories',
+            'CreateManagedLibraryExpression',
+            'CreateNotebook',
+            'CreatePalette',
+            'CreatePermissionsGroup',
+            'CreateScheduledTask',
+            'CreateSearchIndex',
+            'CreateUUID',
+            'CreateWindow',
+            'CriterionFunction',
+            'CriticalSection',
+            'CriticalityFailureImportance',
+            'CriticalitySuccessImportance',
+            'Cross',
+            'CrossEntropyLossLayer',
+            'CrossMatrix',
+            'CrossingDetect',
+            'Csc',
+            'Csch',
+            'CubeRoot',
+            'Cubics',
+            'Cuboid',
+            'Cumulant',
+            'CumulantGeneratingFunction',
+            'Cup',
+            'CupCap',
+            'Curl',
+            'CurrencyConvert',
+            'CurrentImage',
+            'CurrentValue',
+            'CurvatureFlowFilter',
+            'CurveClosed',
+            'Cyan',
+            'CycleGraph',
+            'CycleIndexPolynomial',
+            'Cycles',
+            'CyclicGroup',
+            'Cyclotomic',
+            'Cylinder',
+            'CylindricalDecomposition',
+
+            'D',
+            'DEigensystem',
+            'DEigenvalues',
+            'DGaussianWavelet',
+            'DMSList',
+            'DMSString',
+            'DSolve',
+            'DSolveValue',
+            'DagumDistribution',
+            'DamData',
+            'DamerauLevenshteinDistance',
+            'Darker',
+            'Dashed',
+            'Dashing',
+            'DataDistribution',
+            'DataRange',
+            'DataReversed',
+            'Databin',
+            'DatabinAdd',
+            'DatabinRemove',
+            'DatabinUpload',
+            'Databins',
+            'Dataset',
+            'DateBounds',
+            'DateDifference',
+            'DateFormat',
+            'DateFunction',
+            'DateHistogram',
+            'DateList',
+            'DateListLogPlot',
+            'DateListPlot',
+            'DateListStepPlot',
+            'DateObject',
+            'DateObjectQ',
+            'DatePattern',
+            'DatePlus',
+            'DateRange',
+            'DateReduction',
+            'DateString',
+            'DateTicksFormat',
+            'DateValue',
+            'Dated',
+            'DatedUnit',
+            'DaubechiesWavelet',
+            'DavisDistribution',
+            'DawsonF',
+            'DayCount',
+            'DayCountConvention',
+            'DayHemisphere',
+            'DayMatchQ',
+            'DayName',
+            'DayNightTerminator',
+            'DayPlus',
+            'DayRange',
+            'DayRound',
+            'DaylightQ',
+            'DeBruijnGraph',
+            'Decapitalize',
+            'DeclarePackage',
+            'Decompose',
+            'DeconvolutionLayer',
+            'Decrement',
+            'Decrypt',
+            'DedekindEta',
+            'DeepSpaceProbeData',
+            'Default',
+            'DefaultAxesStyle',
+            'DefaultBaseStyle',
+            'DefaultBoxStyle',
+            'DefaultButton',
+            'DefaultDuplicateCellStyle',
+            'DefaultDuration',
+            'DefaultElement',
+            'DefaultFaceGridsStyle',
+            'DefaultFieldHintStyle',
+            'DefaultFrameStyle',
+            'DefaultFrameTicksStyle',
+            'DefaultGridLinesStyle',
+            'DefaultLabelStyle',
+            'DefaultMenuStyle',
+            'DefaultNaturalLanguage',
+            'DefaultNewCellStyle',
+            'DefaultOptions',
+            'DefaultTicksStyle',
+            'DefaultTooltipStyle',
+            'Defer',
+            'DefineInputStreamMethod',
+            'DefineOutputStreamMethod',
+            'Definition',
+            'Degree',
+            'DegreeCentrality',
+            'DegreeGraphDistribution',
+            'Deinitialization',
+            'Del',
+            'DelaunayMesh',
+            'Delayed',
+            'Deletable',
+            'Delete',
+            'DeleteBorderComponents',
+            'DeleteCases',
+            'DeleteChannel',
+            'DeleteCloudExpression',
+            'DeleteContents',
+            'DeleteDirectory',
+            'DeleteDuplicates',
+            'DeleteDuplicatesBy',
+            'DeleteFile',
+            'DeleteMissing',
+            'DeletePermissionsKey',
+            'DeleteSearchIndex',
+            'DeleteSmallComponents',
+            'DeleteStopwords',
+            'DelimitedSequence',
+            'Delimiter',
+            'DelimiterFlashTime',
+            'Delimiters',
+            'DeliveryFunction',
+            'Dendrogram',
+            'Denominator',
+            'DensityHistogram',
+            'DensityPlot',
+            'DensityPlot3D',
+            'DependentVariables',
+            'Deploy',
+            'Deployed',
+            'Depth',
+            'DepthFirstScan',
+            'Derivative',
+            'DerivativeFilter',
+            'DescriptorStateSpace',
+            'DesignMatrix',
+            'Det',
+            'DeviceClose',
+            'DeviceConfigure',
+            'DeviceExecute',
+            'DeviceExecuteAsynchronous',
+            'DeviceObject',
+            'DeviceOpen',
+            'DeviceRead',
+            'DeviceReadBuffer',
+            'DeviceReadLatest',
+            'DeviceReadList',
+            'DeviceReadTimeSeries',
+            'DeviceStreams',
+            'DeviceWrite',
+            'DeviceWriteBuffer',
+            'Devices',
+            'Diagonal',
+            'DiagonalMatrix',
+            'DiagonalizableMatrixQ',
+            'Dialog',
+            'DialogInput',
+            'DialogNotebook',
+            'DialogProlog',
+            'DialogReturn',
+            'DialogSymbols',
+            'Diamond',
+            'DiamondMatrix',
+            'DiceDissimilarity',
+            'DictionaryLookup',
+            'DictionaryWordQ',
+            'DifferenceDelta',
+            'DifferenceQuotient',
+            'DifferenceRoot',
+            'DifferenceRootReduce',
+            'Differences',
+            'DifferentialD',
+            'DifferentialRoot',
+            'DifferentialRootReduce',
+            'DifferentiatorFilter',
+            'DigitBlock',
+            'DigitCharacter',
+            'DigitCount',
+            'DigitQ',
+            'DihedralGroup',
+            'Dilation',
+            'DimensionReduce',
+            'DimensionReducerFunction',
+            'DimensionReduction',
+            'DimensionalCombinations',
+            'DimensionalMeshComponents',
+            'Dimensions',
+            'DiracComb',
+            'DiracDelta',
+            'DirectedEdge',
+            'DirectedEdges',
+            'DirectedGraph',
+            'DirectedGraphQ',
+            'DirectedInfinity',
+            'Direction',
+            'Directive',
+            'Directory',
+            'DirectoryName',
+            'DirectoryQ',
+            'DirectoryStack',
+            'DirichletBeta',
+            'DirichletCharacter',
+            'DirichletCondition',
+            'DirichletConvolve',
+            'DirichletDistribution',
+            'DirichletEta',
+            'DirichletL',
+            'DirichletLambda',
+            'DirichletTransform',
+            'DirichletWindow',
+            'DisableFormatting',
+            'DiscreteChirpZTransform',
+            'DiscreteConvolve',
+            'DiscreteDelta',
+            'DiscreteHadamardTransform',
+            'DiscreteIndicator',
+            'DiscreteLQEstimatorGains',
+            'DiscreteLQRegulatorGains',
+            'DiscreteLyapunovSolve',
+            'DiscreteMarkovProcess',
+            'DiscretePlot',
+            'DiscretePlot3D',
+            'DiscreteRatio',
+            'DiscreteRiccatiSolve',
+            'DiscreteShift',
+            'DiscreteTimeModelQ',
+            'DiscreteUniformDistribution',
+            'DiscreteVariables',
+            'DiscreteWaveletData',
+            'DiscreteWaveletPacketTransform',
+            'DiscreteWaveletTransform',
+            'DiscretizeGraphics',
+            'DiscretizeRegion',
+            'Discriminant',
+            'DisjointQ',
+            'Disjunction',
+            'Disk',
+            'DiskMatrix',
+            'DiskSegment',
+            'Dispatch',
+            'DispersionEstimatorFunction',
+            'DisplayAllSteps',
+            'DisplayEndPacket',
+            'DisplayForm',
+            'DisplayFunction',
+            'DisplayPacket',
+            'DistanceFunction',
+            'DistanceMatrix',
+            'DistanceTransform',
+            'Distribute',
+            'DistributeDefinitions',
+            'Distributed',
+            'DistributedContexts',
+            'DistributionChart',
+            'DistributionFitTest',
+            'DistributionParameterAssumptions',
+            'DistributionParameterQ',
+            'Dithering',
+            'Div',
+            'Divide',
+            'DivideBy',
+            'Dividers',
+            'Divisible',
+            'DivisorSigma',
+            'DivisorSum',
+            'Divisors',
+            'Do',
+            'DockedCells',
+            'DocumentGenerator',
+            'DocumentGeneratorInformation',
+            'DocumentGenerators',
+            'DocumentNotebook',
+            'DominantColors',
+            'Dot',
+            'DotDashed',
+            'DotEqual',
+            'DotPlusLayer',
+            'Dotted',
+            'DoubleBracketingBar',
+            'DoubleDownArrow',
+            'DoubleLeftArrow',
+            'DoubleLeftRightArrow',
+            'DoubleLeftTee',
+            'DoubleLongLeftArrow',
+            'DoubleLongLeftRightArrow',
+            'DoubleLongRightArrow',
+            'DoubleRightArrow',
+            'DoubleRightTee',
+            'DoubleUpArrow',
+            'DoubleUpDownArrow',
+            'DoubleVerticalBar',
+            'DownArrow',
+            'DownArrowBar',
+            'DownArrowUpArrow',
+            'DownLeftRightVector',
+            'DownLeftTeeVector',
+            'DownLeftVector',
+            'DownLeftVectorBar',
+            'DownRightTeeVector',
+            'DownRightVector',
+            'DownRightVectorBar',
+            'DownTee',
+            'DownTeeArrow',
+            'DownValues',
+            'Downsample',
+            'Drop',
+            'DropoutLayer',
+            'Dt',
+            'DualSystemsModel',
+            'DumpSave',
+            'DuplicateFreeQ',
+            'Duration',
+            'Dynamic',
+            'DynamicEvaluationTimeout',
+            'DynamicGeoGraphics',
+            'DynamicImage',
+            'DynamicModule',
+            'DynamicModuleValues',
+            'DynamicSetting',
+            'DynamicWrapper',
+
+            'E',
+            'EarthImpactData',
+            'EarthquakeData',
+            'EccentricityCentrality',
+            'Echo',
+            'EchoFunction',
+            'EclipseType',
+            'EdgeAdd',
+            'EdgeBetweennessCentrality',
+            'EdgeCapacity',
+            'EdgeConnectivity',
+            'EdgeContract',
+            'EdgeCost',
+            'EdgeCount',
+            'EdgeCoverQ',
+            'EdgeCycleMatrix',
+            'EdgeDelete',
+            'EdgeDetect',
+            'EdgeForm',
+            'EdgeIndex',
+            'EdgeLabelStyle',
+            'EdgeLabeling',
+            'EdgeLabels',
+            'EdgeList',
+            'EdgeQ',
+            'EdgeRenderingFunction',
+            'EdgeRules',
+            'EdgeShapeFunction',
+            'EdgeStyle',
+            'EdgeWeight',
+            'EditDistance',
+            'Editable',
+            'EffectiveInterest',
+            'Eigensystem',
+            'Eigenvalues',
+            'EigenvectorCentrality',
+            'Eigenvectors',
+            'Element',
+            'ElementData',
+            'ElementwiseLayer',
+            'ElidedForms',
+            'Eliminate',
+            'Ellipsoid',
+            'EllipticE',
+            'EllipticExp',
+            'EllipticExpPrime',
+            'EllipticF',
+            'EllipticFilterModel',
+            'EllipticK',
+            'EllipticLog',
+            'EllipticNomeQ',
+            'EllipticPi',
+            'EllipticTheta',
+            'EllipticThetaPrime',
+            'EmbedCode',
+            'EmbeddedHTML',
+            'EmbeddedService',
+            'EmbeddingLayer',
+            'EmitSound',
+            'EmpiricalDistribution',
+            'EmptyGraphQ',
+            'EmptyRegion',
+            'Enabled',
+            'Encode',
+            'Encrypt',
+            'EncryptedObject',
+            'End',
+            'EndDialogPacket',
+            'EndOfBuffer',
+            'EndOfFile',
+            'EndOfLine',
+            'EndOfString',
+            'EndPackage',
+            'EngineeringForm',
+            'EnterExpressionPacket',
+            'EnterTextPacket',
+            'Entity',
+            'EntityClass',
+            'EntityClassList',
+            'EntityCopies',
+            'EntityGroup',
+            'EntityInstance',
+            'EntityList',
+            'EntityProperties',
+            'EntityProperty',
+            'EntityPropertyClass',
+            'EntityStore',
+            'EntityTypeName',
+            'EntityValue',
+            'Entropy',
+            'EntropyFilter',
+            'Environment',
+            'Epilog',
+            'EpilogFunction',
+            'Equal',
+            'EqualTilde',
+            'EqualTo',
+            'Equilibrium',
+            'EquirippleFilterKernel',
+            'Equivalent',
+            'Erf',
+            'Erfc',
+            'Erfi',
+            'ErlangB',
+            'ErlangC',
+            'ErlangDistribution',
+            'Erosion',
+            'ErrorBox',
+            'EscapeRadius',
+            'EstimatedBackground',
+            'EstimatedDistribution',
+            'EstimatedProcess',
+            'EstimatorGains',
+            'EstimatorRegulator',
+            'EuclideanDistance',
+            'EulerAngles',
+            'EulerE',
+            'EulerGamma',
+            'EulerMatrix',
+            'EulerPhi',
+            'EulerianGraphQ',
+            'Evaluatable',
+            'Evaluate',
+            'EvaluatePacket',
+            'EvaluateScheduledTask',
+            'EvaluationBox',
+            'EvaluationCell',
+            'EvaluationData',
+            'EvaluationElements',
+            'EvaluationMonitor',
+            'EvaluationNotebook',
+            'EvaluationObject',
+            'Evaluator',
+            'EvenQ',
+            'EventData',
+            'EventHandler',
+            'EventLabels',
+            'EventSeries',
+            'ExactBlackmanWindow',
+            'ExactNumberQ',
+            'ExampleData',
+            'Except',
+            'ExcludePods',
+            'ExcludedForms',
+            'ExcludedLines',
+            'ExcludedPhysicalQuantities',
+            'Exclusions',
+            'ExclusionsStyle',
+            'Exists',
+            'Exit',
+            'ExoplanetData',
+            'Exp',
+            'ExpGammaDistribution',
+            'ExpIntegralE',
+            'ExpIntegralEi',
+            'ExpToTrig',
+            'Expand',
+            'ExpandAll',
+            'ExpandDenominator',
+            'ExpandFileName',
+            'ExpandNumerator',
+            'Expectation',
+            'Exponent',
+            'ExponentFunction',
+            'ExponentStep',
+            'ExponentialDistribution',
+            'ExponentialFamily',
+            'ExponentialGeneratingFunction',
+            'ExponentialMovingAverage',
+            'ExponentialPowerDistribution',
+            'Export',
+            'ExportForm',
+            'ExportString',
+            'Expression',
+            'ExpressionCell',
+            'ExtendedGCD',
+            'Extension',
+            'ExtentElementFunction',
+            'ExtentMarkers',
+            'ExtentSize',
+            'ExternalBundle',
+            'ExternalOptions',
+            'ExternalTypeSignature',
+            'Extract',
+            'ExtractArchive',
+            'ExtremeValueDistribution',
+
+            'FARIMAProcess',
+            'FRatioDistribution',
+            'FaceForm',
+            'FaceGrids',
+            'FaceGridsStyle',
+            'Factor',
+            'FactorInteger',
+            'FactorList',
+            'FactorSquareFree',
+            'FactorSquareFreeList',
+            'FactorTerms',
+            'FactorTermsList',
+            'Factorial',
+            'Factorial2',
+            'FactorialMoment',
+            'FactorialMomentGeneratingFunction',
+            'FactorialPower',
+            'Failure',
+            'FailureAction',
+            'FailureDistribution',
+            'FailureQ',
+            'False',
+            'FareySequence',
+            'FeatureDistance',
+            'FeatureExtract',
+            'FeatureExtraction',
+            'FeatureExtractor',
+            'FeatureExtractorFunction',
+            'FeatureNames',
+            'FeatureTypes',
+            'FeedbackLinearize',
+            'FeedbackSector',
+            'FeedbackSectorStyle',
+            'FeedbackType',
+            'FetalGrowthData',
+            'Fibonacci',
+            'Fibonorial',
+            'FieldHint',
+            'FieldHintStyle',
+            'FieldMasked',
+            'FieldSize',
+            'File',
+            'FileBaseName',
+            'FileByteCount',
+            'FileDate',
+            'FileExistsQ',
+            'FileExtension',
+            'FileFormat',
+            'FileHash',
+            'FileNameDepth',
+            'FileNameDrop',
+            'FileNameForms',
+            'FileNameJoin',
+            'FileNameSetter',
+            'FileNameSplit',
+            'FileNameTake',
+            'FileNames',
+            'FilePrint',
+            'FileSystemMap',
+            'FileSystemScan',
+            'FileTemplate',
+            'FileTemplateApply',
+            'FileType',
+            'FilledCurve',
+            'Filling',
+            'FillingStyle',
+            'FillingTransform',
+            'FilterRules',
+            'FinancialBond',
+            'FinancialData',
+            'FinancialDerivative',
+            'FinancialIndicator',
+            'Find',
+            'FindArgMax',
+            'FindArgMin',
+            'FindChannels',
+            'FindClique',
+            'FindClusters',
+            'FindCookies',
+            'FindCurvePath',
+            'FindCycle',
+            'FindDevices',
+            'FindDistribution',
+            'FindDistributionParameters',
+            'FindDivisions',
+            'FindEdgeCover',
+            'FindEdgeCut',
+            'FindEdgeIndependentPaths',
+            'FindEulerianCycle',
+            'FindFaces',
+            'FindFile',
+            'FindFit',
+            'FindFormula',
+            'FindFundamentalCycles',
+            'FindGeneratingFunction',
+            'FindGeoLocation',
+            'FindGeometricTransform',
+            'FindGraphCommunities',
+            'FindGraphIsomorphism',
+            'FindGraphPartition',
+            'FindHamiltonianCycle',
+            'FindHamiltonianPath',
+            'FindHiddenMarkovStates',
+            'FindIndependentEdgeSet',
+            'FindIndependentVertexSet',
+            'FindInstance',
+            'FindIntegerNullVector',
+            'FindKClan',
+            'FindKClique',
+            'FindKClub',
+            'FindKPlex',
+            'FindLibrary',
+            'FindLinearRecurrence',
+            'FindList',
+            'FindMaxValue',
+            'FindMaximum',
+            'FindMaximumFlow',
+            'FindMeshDefects',
+            'FindMinValue',
+            'FindMinimum',
+            'FindMinimumCostFlow',
+            'FindMinimumCut',
+            'FindPath',
+            'FindPeaks',
+            'FindPermutation',
+            'FindPostmanTour',
+            'FindProcessParameters',
+            'FindRoot',
+            'FindSequenceFunction',
+            'FindSettings',
+            'FindShortestPath',
+            'FindShortestTour',
+            'FindSpanningTree',
+            'FindThreshold',
+            'FindTransientRepeat',
+            'FindVertexCover',
+            'FindVertexCut',
+            'FindVertexIndependentPaths',
+            'FinishDynamic',
+            'FiniteAbelianGroupCount',
+            'FiniteGroupCount',
+            'FiniteGroupData',
+            'First',
+            'FirstCase',
+            'FirstPassageTimeDistribution',
+            'FirstPosition',
+            'FischerGroupFi22',
+            'FischerGroupFi23',
+            'FischerGroupFi24Prime',
+            'FisherHypergeometricDistribution',
+            'FisherRatioTest',
+            'FisherZDistribution',
+            'Fit',
+            'FittedModel',
+            'FixedOrder',
+            'FixedPoint',
+            'FixedPointList',
+            'Flat',
+            'FlatTopWindow',
+            'Flatten',
+            'FlattenAt',
+            'FlattenLayer',
+            'FlipView',
+            'Floor',
+            'FlowPolynomial',
+            'Fold',
+            'FoldList',
+            'FoldPair',
+            'FoldPairList',
+            'FollowRedirects',
+            'FontColor',
+            'FontFamily',
+            'FontSize',
+            'FontSlant',
+            'FontSubstitutions',
+            'FontTracking',
+            'FontVariations',
+            'FontWeight',
+            'For',
+            'ForAll',
+            'FormBox',
+            'FormBoxOptions',
+            'FormControl',
+            'FormFunction',
+            'FormLayoutFunction',
+            'FormObject',
+            'FormPage',
+            'Format',
+            'FormatType',
+            'FormulaData',
+            'FormulaLookup',
+            'FortranForm',
+            'Forward',
+            'ForwardBackward',
+            'Fourier',
+            'FourierCoefficient',
+            'FourierCosCoefficient',
+            'FourierCosSeries',
+            'FourierCosTransform',
+            'FourierDCT',
+            'FourierDCTFilter',
+            'FourierDCTMatrix',
+            'FourierDST',
+            'FourierDSTMatrix',
+            'FourierMatrix',
+            'FourierParameters',
+            'FourierSequenceTransform',
+            'FourierSeries',
+            'FourierSinCoefficient',
+            'FourierSinSeries',
+            'FourierSinTransform',
+            'FourierTransform',
+            'FourierTrigSeries',
+            'FractionBox',
+            'FractionBoxOptions',
+            'FractionalBrownianMotionProcess',
+            'FractionalGaussianNoiseProcess',
+            'FractionalPart',
+            'Frame',
+            'FrameBox',
+            'FrameBoxOptions',
+            'FrameLabel',
+            'FrameMargins',
+            'FrameStyle',
+            'FrameTicks',
+            'FrameTicksStyle',
+            'Framed',
+            'FrechetDistribution',
+            'FreeQ',
+            'FrenetSerretSystem',
+            'FrequencySamplingFilterKernel',
+            'FresnelC',
+            'FresnelF',
+            'FresnelG',
+            'FresnelS',
+            'Friday',
+            'FrobeniusNumber',
+            'FrobeniusSolve',
+            'FromCharacterCode',
+            'FromCoefficientRules',
+            'FromContinuedFraction',
+            'FromDMS',
+            'FromDigits',
+            'FromEntity',
+            'FromJulianDate',
+            'FromLetterNumber',
+            'FromPolarCoordinates',
+            'FromRomanNumeral',
+            'FromSphericalCoordinates',
+            'FromUnixTime',
+            'Front',
+            'FrontEndDynamicExpression',
+            'FrontEndEventActions',
+            'FrontEndExecute',
+            'FrontEndToken',
+            'FrontEndTokenExecute',
+            'Full',
+            'FullDefinition',
+            'FullForm',
+            'FullGraphics',
+            'FullInformationOutputRegulator',
+            'FullRegion',
+            'FullSimplify',
+            'Function',
+            'FunctionDomain',
+            'FunctionExpand',
+            'FunctionInterpolation',
+            'FunctionPeriod',
+            'FunctionRange',
+            'FunctionSpace',
+            'FussellVeselyImportance',
+
+            'GARCHProcess',
+            'GCD',
+            'GaborFilter',
+            'GaborMatrix',
+            'GaborWavelet',
+            'GainMargins',
+            'GainPhaseMargins',
+            'GalaxyData',
+            'GalleryView',
+            'Gamma',
+            'GammaDistribution',
+            'GammaRegularized',
+            'GapPenalty',
+            'Gather',
+            'GatherBy',
+            'GaugeFaceElementFunction',
+            'GaugeFaceStyle',
+            'GaugeFrameElementFunction',
+            'GaugeFrameSize',
+            'GaugeFrameStyle',
+            'GaugeLabels',
+            'GaugeMarkers',
+            'GaugeStyle',
+            'GaussianFilter',
+            'GaussianIntegers',
+            'GaussianMatrix',
+            'GaussianOrthogonalMatrixDistribution',
+            'GaussianSymplecticMatrixDistribution',
+            'GaussianUnitaryMatrixDistribution',
+            'GaussianWindow',
+            'GegenbauerC',
+            'General',
+            'GeneralizedLinearModelFit',
+            'GenerateAsymmetricKeyPair',
+            'GenerateConditions',
+            'GenerateDocument',
+            'GenerateHTTPResponse',
+            'GenerateSymmetricKey',
+            'GeneratedCell',
+            'GeneratedDocumentBinding',
+            'GeneratedParameters',
+            'GeneratingFunction',
+            'GeneratorDescription',
+            'GeneratorHistoryLength',
+            'GeneratorOutputType',
+            'GenericCylindricalDecomposition',
+            'GenomeData',
+            'GenomeLookup',
+            'GeoArea',
+            'GeoBackground',
+            'GeoBoundingBox',
+            'GeoBounds',
+            'GeoBoundsRegion',
+            'GeoCenter',
+            'GeoCircle',
+            'GeoDestination',
+            'GeoDirection',
+            'GeoDisk',
+            'GeoDisplacement',
+            'GeoDistance',
+            'GeoDistanceList',
+            'GeoElevationData',
+            'GeoEntities',
+            'GeoGraphics',
+            'GeoGridLines',
+            'GeoGridLinesStyle',
+            'GeoGridPosition',
+            'GeoGroup',
+            'GeoHemisphere',
+            'GeoHemisphereBoundary',
+            'GeoHistogram',
+            'GeoIdentify',
+            'GeoLabels',
+            'GeoLength',
+            'GeoListPlot',
+            'GeoLocation',
+            'GeoMarker',
+            'GeoModel',
+            'GeoNearest',
+            'GeoPath',
+            'GeoPosition',
+            'GeoPositionENU',
+            'GeoPositionXYZ',
+            'GeoProjection',
+            'GeoProjectionData',
+            'GeoRange',
+            'GeoRangePadding',
+            'GeoRegionValuePlot',
+            'GeoScaleBar',
+            'GeoServer',
+            'GeoStyling',
+            'GeoStylingImageFunction',
+            'GeoVariant',
+            'GeoVisibleRegion',
+            'GeoVisibleRegionBoundary',
+            'GeoWithinQ',
+            'GeoZoomLevel',
+            'GeodesicClosing',
+            'GeodesicDilation',
+            'GeodesicErosion',
+            'GeodesicOpening',
+            'GeodesyData',
+            'GeogravityModelData',
+            'GeologicalPeriodData',
+            'GeomagneticModelData',
+            'GeometricBrownianMotionProcess',
+            'GeometricDistribution',
+            'GeometricMean',
+            'GeometricMeanFilter',
+            'GeometricTransformation',
+            'GestureHandler',
+            'Get',
+            'GetEnvironment',
+            'Glaisher',
+            'GlobalClusteringCoefficient',
+            'Glow',
+            'GoldenAngle',
+            'GoldenRatio',
+            'GompertzMakehamDistribution',
+            'GoodmanKruskalGamma',
+            'GoodmanKruskalGammaTest',
+            'Goto',
+            'Grad',
+            'Gradient',
+            'GradientFilter',
+            'GradientOrientationFilter',
+            'GrammarApply',
+            'GrammarRules',
+            'GrammarToken',
+            'Graph',
+            'Graph3D',
+            'GraphAssortativity',
+            'GraphAutomorphismGroup',
+            'GraphCenter',
+            'GraphComplement',
+            'GraphData',
+            'GraphDensity',
+            'GraphDiameter',
+            'GraphDifference',
+            'GraphDisjointUnion',
+            'GraphDistance',
+            'GraphDistanceMatrix',
+            'GraphEmbedding',
+            'GraphHighlight',
+            'GraphHighlightStyle',
+            'GraphHub',
+            'GraphIntersection',
+            'GraphLayout',
+            'GraphLinkEfficiency',
+            'GraphPeriphery',
+            'GraphPlot',
+            'GraphPlot3D',
+            'GraphPower',
+            'GraphPropertyDistribution',
+            'GraphQ',
+            'GraphRadius',
+            'GraphReciprocity',
+            'GraphStyle',
+            'GraphUnion',
+            'Graphics',
+            'Graphics3D',
+            'GraphicsColumn',
+            'GraphicsComplex',
+            'GraphicsGrid',
+            'GraphicsGroup',
+            'GraphicsRow',
+            'Gray',
+            'GrayLevel',
+            'Greater',
+            'GreaterEqual',
+            'GreaterEqualLess',
+            'GreaterEqualThan',
+            'GreaterFullEqual',
+            'GreaterGreater',
+            'GreaterLess',
+            'GreaterSlantEqual',
+            'GreaterThan',
+            'GreaterTilde',
+            'Green',
+            'GreenFunction',
+            'Grid',
+            'GridBox',
+            'GridDefaultElement',
+            'GridGraph',
+            'GridLines',
+            'GridLinesStyle',
+            'GroebnerBasis',
+            'GroupActionBase',
+            'GroupBy',
+            'GroupCentralizer',
+            'GroupElementFromWord',
+            'GroupElementPosition',
+            'GroupElementQ',
+            'GroupElementToWord',
+            'GroupElements',
+            'GroupGenerators',
+            'GroupMultiplicationTable',
+            'GroupOrbits',
+            'GroupOrder',
+            'GroupPageBreakWithin',
+            'GroupSetwiseStabilizer',
+            'GroupStabilizer',
+            'GroupStabilizerChain',
+            'Groupings',
+            'GrowCutComponents',
+            'Gudermannian',
+            'GuidedFilter',
+            'GumbelDistribution',
+
+            'HITSCentrality',
+            'HTTPErrorResponse',
+            'HTTPRedirect',
+            'HTTPRequest',
+            'HTTPRequestData',
+            'HTTPResponse',
+            'HaarWavelet',
+            'HadamardMatrix',
+            'HalfLine',
+            'HalfNormalDistribution',
+            'HalfPlane',
+            'HalfSpace',
+            'HamiltonianGraphQ',
+            'HammingDistance',
+            'HammingWindow',
+            'HandlerFunctions',
+            'HandlerFunctionsKeys',
+            'HankelH1',
+            'HankelH2',
+            'HankelMatrix',
+            'HannPoissonWindow',
+            'HannWindow',
+            'HaradaNortonGroupHN',
+            'HararyGraph',
+            'HarmonicMean',
+            'HarmonicMeanFilter',
+            'HarmonicNumber',
+            'Hash',
+            'Haversine',
+            'HazardFunction',
+            'Head',
+            'HeaderLines',
+            'Heads',
+            'HeavisideLambda',
+            'HeavisidePi',
+            'HeavisideTheta',
+            'HeldGroupHe',
+            'Here',
+            'HermiteDecomposition',
+            'HermiteH',
+            'HermitianMatrixQ',
+            'HessenbergDecomposition',
+            'HexadecimalCharacter',
+            'Hexahedron',
+            'HiddenMarkovProcess',
+            'HighlightGraph',
+            'HighlightImage',
+            'HighlightMesh',
+            'Highlighted',
+            'HighpassFilter',
+            'HigmanSimsGroupHS',
+            'HilbertFilter',
+            'HilbertMatrix',
+            'Histogram',
+            'Histogram3D',
+            'HistogramDistribution',
+            'HistogramList',
+            'HistogramTransform',
+            'HistogramTransformInterpolation',
+            'HistoricalPeriodData',
+            'HitMissTransform',
+            'HodgeDual',
+            'HoeffdingD',
+            'HoeffdingDTest',
+            'Hold',
+            'HoldAll',
+            'HoldAllComplete',
+            'HoldComplete',
+            'HoldFirst',
+            'HoldForm',
+            'HoldPattern',
+            'HoldRest',
+            'HolidayCalendar',
+            'HorizontalGauge',
+            'HornerForm',
+            'HostLookup',
+            'HotellingTSquareDistribution',
+            'HoytDistribution',
+            'Hue',
+            'HumanGrowthData',
+            'HumpDownHump',
+            'HumpEqual',
+            'HurwitzLerchPhi',
+            'HurwitzZeta',
+            'HyperbolicDistribution',
+            'HypercubeGraph',
+            'HyperexponentialDistribution',
+            'Hyperfactorial',
+            'Hypergeometric0F1',
+            'Hypergeometric0F1Regularized',
+            'Hypergeometric1F1',
+            'Hypergeometric1F1Regularized',
+            'Hypergeometric2F1',
+            'Hypergeometric2F1Regularized',
+            'HypergeometricDistribution',
+            'HypergeometricPFQ',
+            'HypergeometricPFQRegularized',
+            'HypergeometricU',
+            'Hyperlink',
+            'Hyperplane',
+            'Hyphenation',
+            'HypoexponentialDistribution',
+            'HypothesisTestData',
+
+            'I',
+            'IPAddress',
+            'IconData',
+            'IconRules',
+            'Identity',
+            'IdentityMatrix',
+            'If',
+            'IgnoreCase',
+            'IgnoreDiacritics',
+            'IgnorePunctuation',
+            'IgnoringInactive',
+            'Im',
+            'Image',
+            'Image3D',
+            'Image3DSlices',
+            'ImageAccumulate',
+            'ImageAdd',
+            'ImageAdjust',
+            'ImageAlign',
+            'ImageApply',
+            'ImageApplyIndexed',
+            'ImageAspectRatio',
+            'ImageAssemble',
+            'ImageCapture',
+            'ImageChannels',
+            'ImageClip',
+            'ImageCollage',
+            'ImageColorSpace',
+            'ImageCompose',
+            'ImageConvolve',
+            'ImageCooccurrence',
+            'ImageCorners',
+            'ImageCorrelate',
+            'ImageCorrespondingPoints',
+            'ImageCrop',
+            'ImageData',
+            'ImageDeconvolve',
+            'ImageDemosaic',
+            'ImageDifference',
+            'ImageDimensions',
+            'ImageDisplacements',
+            'ImageDistance',
+            'ImageEffect',
+            'ImageExposureCombine',
+            'ImageFeatureTrack',
+            'ImageFileApply',
+            'ImageFileFilter',
+            'ImageFileScan',
+            'ImageFilter',
+            'ImageFocusCombine',
+            'ImageForestingComponents',
+            'ImageFormattingWidth',
+            'ImageForwardTransformation',
+            'ImageHistogram',
+            'ImageIdentify',
+            'ImageInstanceQ',
+            'ImageKeypoints',
+            'ImageLevels',
+            'ImageLines',
+            'ImageMargins',
+            'ImageMarker',
+            'ImageMeasurements',
+            'ImageMesh',
+            'ImageMultiply',
+            'ImagePad',
+            'ImagePadding',
+            'ImagePartition',
+            'ImagePeriodogram',
+            'ImagePerspectiveTransformation',
+            'ImageQ',
+            'ImageReflect',
+            'ImageResize',
+            'ImageResolution',
+            'ImageRotate',
+            'ImageSaliencyFilter',
+            'ImageScaled',
+            'ImageScan',
+            'ImageSize',
+            'ImageSizeAction',
+            'ImageSizeMultipliers',
+            'ImageSubtract',
+            'ImageTake',
+            'ImageTransformation',
+            'ImageTrim',
+            'ImageType',
+            'ImageValue',
+            'ImageValuePositions',
+            'ImagingDevice',
+            'ImplicitRegion',
+            'Implies',
+            'Import',
+            'ImportOptions',
+            'ImportString',
+            'ImprovementImportance',
+            'In',
+            'InString',
+            'Inactivate',
+            'Inactive',
+            'IncidenceGraph',
+            'IncidenceList',
+            'IncidenceMatrix',
+            'IncludeConstantBasis',
+            'IncludeGeneratorTasks',
+            'IncludeInflections',
+            'IncludeMetaInformation',
+            'IncludePods',
+            'IncludeQuantities',
+            'IncludeWindowTimes',
+            'Increment',
+            'IndefiniteMatrixQ',
+            'IndependenceTest',
+            'IndependentEdgeSetQ',
+            'IndependentUnit',
+            'IndependentVertexSetQ',
+            'Indeterminate',
+            'IndeterminateThreshold',
+            'IndexGraph',
+            'Indexed',
+            'InexactNumberQ',
+            'InfiniteLine',
+            'InfinitePlane',
+            'Infinity',
+            'Infix',
+            'InflationAdjust',
+            'InflationMethod',
+            'Information',
+            'InheritScope',
+            'Inherited',
+            'InhomogeneousPoissonProcess',
+            'InitialEvaluationHistory',
+            'Initialization',
+            'InitializationCell',
+            'Inner',
+            'Inpaint',
+            'Input',
+            'InputAliases',
+            'InputAssumptions',
+            'InputAutoReplacements',
+            'InputField',
+            'InputForm',
+            'InputNamePacket',
+            'InputNotebook',
+            'InputPacket',
+            'InputStream',
+            'InputString',
+            'InputStringPacket',
+            'Insert',
+            'InsertLinebreaks',
+            'InsertResults',
+            'InsertionFunction',
+            'Inset',
+            'Insphere',
+            'Install',
+            'InstallService',
+            'Integer',
+            'IntegerDigits',
+            'IntegerExponent',
+            'IntegerLength',
+            'IntegerName',
+            'IntegerPart',
+            'IntegerPartitions',
+            'IntegerQ',
+            'IntegerReverse',
+            'IntegerString',
+            'Integers',
+            'Integrate',
+            'Interactive',
+            'InteractiveTradingChart',
+            'Interleaving',
+            'InternallyBalancedDecomposition',
+            'InterpolatingFunction',
+            'InterpolatingPolynomial',
+            'Interpolation',
+            'InterpolationOrder',
+            'InterpolationPoints',
+            'Interpretation',
+            'InterpretationBox',
+            'InterpretationBoxOptions',
+            'Interpreter',
+            'InterquartileRange',
+            'Interrupt',
+            'IntersectingQ',
+            'Intersection',
+            'Interval',
+            'IntervalIntersection',
+            'IntervalMemberQ',
+            'IntervalSlider',
+            'IntervalUnion',
+            'Inverse',
+            'InverseBetaRegularized',
+            'InverseCDF',
+            'InverseChiSquareDistribution',
+            'InverseContinuousWaveletTransform',
+            'InverseDistanceTransform',
+            'InverseEllipticNomeQ',
+            'InverseErf',
+            'InverseErfc',
+            'InverseFourier',
+            'InverseFourierCosTransform',
+            'InverseFourierSequenceTransform',
+            'InverseFourierSinTransform',
+            'InverseFourierTransform',
+            'InverseFunction',
+            'InverseFunctions',
+            'InverseGammaDistribution',
+            'InverseGammaRegularized',
+            'InverseGaussianDistribution',
+            'InverseGudermannian',
+            'InverseHaversine',
+            'InverseJacobiCD',
+            'InverseJacobiCN',
+            'InverseJacobiCS',
+            'InverseJacobiDC',
+            'InverseJacobiDN',
+            'InverseJacobiDS',
+            'InverseJacobiNC',
+            'InverseJacobiND',
+            'InverseJacobiNS',
+            'InverseJacobiSC',
+            'InverseJacobiSD',
+            'InverseJacobiSN',
+            'InverseLaplaceTransform',
+            'InverseMellinTransform',
+            'InversePermutation',
+            'InverseRadon',
+            'InverseSeries',
+            'InverseSurvivalFunction',
+            'InverseTransformedRegion',
+            'InverseWaveletTransform',
+            'InverseWeierstrassP',
+            'InverseWishartMatrixDistribution',
+            'InverseZTransform',
+            'Invisible',
+            'IrreduciblePolynomialQ',
+            'IslandData',
+            'IsolatingInterval',
+            'IsomorphicGraphQ',
+            'IsotopeData',
+            'Italic',
+            'Item',
+            'ItemAspectRatio',
+            'ItemSize',
+            'ItemStyle',
+            'ItoProcess',
+
+            'JaccardDissimilarity',
+            'JacobiAmplitude',
+            'JacobiCD',
+            'JacobiCN',
+            'JacobiCS',
+            'JacobiDC',
+            'JacobiDN',
+            'JacobiDS',
+            'JacobiNC',
+            'JacobiND',
+            'JacobiNS',
+            'JacobiP',
+            'JacobiSC',
+            'JacobiSD',
+            'JacobiSN',
+            'JacobiSymbol',
+            'JacobiZeta',
+            'JankoGroupJ1',
+            'JankoGroupJ2',
+            'JankoGroupJ3',
+            'JankoGroupJ4',
+            'JarqueBeraALMTest',
+            'JohnsonDistribution',
+            'Join',
+            'JoinAcross',
+            'JoinForm',
+            'Joined',
+            'JoinedCurve',
+            'JordanDecomposition',
+            'JordanModelDecomposition',
+            'JuliaSetBoettcher',
+            'JuliaSetIterationCount',
+            'JuliaSetPlot',
+            'JuliaSetPoints',
+            'JulianDate',
+
+            'KCoreComponents',
+            'KDistribution',
+            'KEdgeConnectedComponents',
+            'KEdgeConnectedGraphQ',
+            'KVertexConnectedComponents',
+            'KVertexConnectedGraphQ',
+            'KagiChart',
+            'KaiserBesselWindow',
+            'KaiserWindow',
+            'KalmanEstimator',
+            'KalmanFilter',
+            'KarhunenLoeveDecomposition',
+            'KaryTree',
+            'KatzCentrality',
+            'KelvinBei',
+            'KelvinBer',
+            'KelvinKei',
+            'KelvinKer',
+            'KendallTau',
+            'KendallTauTest',
+            'KernelMixtureDistribution',
+            'KernelObject',
+            'Kernels',
+            'Key',
+            'KeyCollisionFunction',
+            'KeyComplement',
+            'KeyDrop',
+            'KeyDropFrom',
+            'KeyExistsQ',
+            'KeyFreeQ',
+            'KeyIntersection',
+            'KeyMap',
+            'KeyMemberQ',
+            'KeySelect',
+            'KeySort',
+            'KeySortBy',
+            'KeyTake',
+            'KeyUnion',
+            'KeyValueMap',
+            'KeyValuePattern',
+            'KeypointStrength',
+            'Keys',
+            'Khinchin',
+            'KillProcess',
+            'KirchhoffGraph',
+            'KirchhoffMatrix',
+            'KleinInvariantJ',
+            'KnapsackSolve',
+            'KnightTourGraph',
+            'KnotData',
+            'KnownUnitQ',
+            'KolmogorovSmirnovTest',
+            'KroneckerDelta',
+            'KroneckerModelDecomposition',
+            'KroneckerProduct',
+            'KroneckerSymbol',
+            'KuiperTest',
+            'KumaraswamyDistribution',
+            'Kurtosis',
+            'KuwaharaFilter',
+
+            'LABColor',
+            'LCHColor',
+            'LCM',
+            'LQEstimatorGains',
+            'LQGRegulator',
+            'LQOutputRegulatorGains',
+            'LQRegulatorGains',
+            'LUDecomposition',
+            'LUVColor',
+            'Label',
+            'LabelStyle',
+            'Labeled',
+            'LabelingFunction',
+            'LaguerreL',
+            'LakeData',
+            'LambdaComponents',
+            'LaminaData',
+            'LanczosWindow',
+            'LandauDistribution',
+            'Language',
+            'LanguageCategory',
+            'LanguageData',
+            'LanguageIdentify',
+            'LaplaceDistribution',
+            'LaplaceTransform',
+            'Laplacian',
+            'LaplacianFilter',
+            'LaplacianGaussianFilter',
+            'Large',
+            'Larger',
+            'Last',
+            'Latitude',
+            'LatitudeLongitude',
+            'LatticeData',
+            'LatticeReduce',
+            'LaunchKernels',
+            'LayerSizeFunction',
+            'LayeredGraphPlot',
+            'LeaderSize',
+            'LeafCount',
+            'LeapYearQ',
+            'LeastSquares',
+            'LeastSquaresFilterKernel',
+            'Left',
+            'LeftArrow',
+            'LeftArrowBar',
+            'LeftArrowRightArrow',
+            'LeftDownTeeVector',
+            'LeftDownVector',
+            'LeftDownVectorBar',
+            'LeftRightArrow',
+            'LeftRightVector',
+            'LeftTee',
+            'LeftTeeArrow',
+            'LeftTeeVector',
+            'LeftTriangle',
+            'LeftTriangleBar',
+            'LeftTriangleEqual',
+            'LeftUpDownVector',
+            'LeftUpTeeVector',
+            'LeftUpVector',
+            'LeftUpVectorBar',
+            'LeftVector',
+            'LeftVectorBar',
+            'LegendAppearance',
+            'LegendFunction',
+            'LegendLabel',
+            'LegendLayout',
+            'LegendMargins',
+            'LegendMarkerSize',
+            'LegendMarkers',
+            'Legended',
+            'LegendreP',
+            'LegendreQ',
+            'Length',
+            'LengthWhile',
+            'LerchPhi',
+            'Less',
+            'LessEqual',
+            'LessEqualGreater',
+            'LessEqualThan',
+            'LessFullEqual',
+            'LessGreater',
+            'LessLess',
+            'LessSlantEqual',
+            'LessThan',
+            'LessTilde',
+            'LetterCharacter',
+            'LetterCounts',
+            'LetterNumber',
+            'LetterQ',
+            'Level',
+            'LeveneTest',
+            'LeviCivitaTensor',
+            'LevyDistribution',
+            'LibraryDataType',
+            'LibraryFunction',
+            'LibraryFunctionError',
+            'LibraryFunctionInformation',
+            'LibraryFunctionLoad',
+            'LibraryFunctionUnload',
+            'LibraryLoad',
+            'LibraryUnload',
+            'LiftingFilterData',
+            'LiftingWaveletTransform',
+            'LightBlue',
+            'LightBrown',
+            'LightCyan',
+            'LightGray',
+            'LightGreen',
+            'LightMagenta',
+            'LightOrange',
+            'LightPink',
+            'LightPurple',
+            'LightRed',
+            'LightYellow',
+            'Lighter',
+            'Lighting',
+            'LightingAngle',
+            'Likelihood',
+            'Limit',
+            'LimitsPositioning',
+            'LindleyDistribution',
+            'Line',
+            'LineBreakChart',
+            'LineGraph',
+            'LineIndent',
+            'LineIndentMaxFraction',
+            'LineIntegralConvolutionPlot',
+            'LineIntegralConvolutionScale',
+            'LineLegend',
+            'LineSpacing',
+            'LinearFractionalTransform',
+            'LinearGradientImage',
+            'LinearModelFit',
+            'LinearOffsetFunction',
+            'LinearProgramming',
+            'LinearRecurrence',
+            'LinearSolve',
+            'LinearSolveFunction',
+            'LinearizingTransformationData',
+            'LinkActivate',
+            'LinkClose',
+            'LinkConnect',
+            'LinkCreate',
+            'LinkFunction',
+            'LinkInterrupt',
+            'LinkLaunch',
+            'LinkObject',
+            'LinkPatterns',
+            'LinkProtocol',
+            'LinkRankCentrality',
+            'LinkRead',
+            'LinkReadyQ',
+            'LinkWrite',
+            'Links',
+            'LiouvilleLambda',
+            'List',
+            'ListAnimate',
+            'ListContourPlot',
+            'ListContourPlot3D',
+            'ListConvolve',
+            'ListCorrelate',
+            'ListCurvePathPlot',
+            'ListDeconvolve',
+            'ListDensityPlot',
+            'ListDensityPlot3D',
+            'ListFormat',
+            'ListFourierSequenceTransform',
+            'ListInterpolation',
+            'ListLineIntegralConvolutionPlot',
+            'ListLinePlot',
+            'ListLogLinearPlot',
+            'ListLogLogPlot',
+            'ListLogPlot',
+            'ListPicker',
+            'ListPickerBox',
+            'ListPickerBoxOptions',
+            'ListPlay',
+            'ListPlot',
+            'ListPlot3D',
+            'ListPointPlot3D',
+            'ListPolarPlot',
+            'ListQ',
+            'ListSliceContourPlot3D',
+            'ListSliceDensityPlot3D',
+            'ListSliceVectorPlot3D',
+            'ListStepPlot',
+            'ListStreamDensityPlot',
+            'ListStreamPlot',
+            'ListSurfacePlot3D',
+            'ListVectorDensityPlot',
+            'ListVectorPlot',
+            'ListVectorPlot3D',
+            'ListZTransform',
+            'Listable',
+            'LocalAdaptiveBinarize',
+            'LocalCache',
+            'LocalClusteringCoefficient',
+            'LocalObject',
+            'LocalObjects',
+            'LocalSymbol',
+            'LocalTime',
+            'LocalTimeZone',
+            'LocalizeVariables',
+            'LocationEquivalenceTest',
+            'LocationTest',
+            'Locator',
+            'LocatorAutoCreate',
+            'LocatorPane',
+            'LocatorRegion',
+            'Locked',
+            'Log',
+            'Log10',
+            'Log2',
+            'LogBarnesG',
+            'LogGamma',
+            'LogGammaDistribution',
+            'LogIntegral',
+            'LogLikelihood',
+            'LogLinearPlot',
+            'LogLogPlot',
+            'LogLogisticDistribution',
+            'LogMultinormalDistribution',
+            'LogNormalDistribution',
+            'LogPlot',
+            'LogRankTest',
+            'LogSeriesDistribution',
+            'LogicalExpand',
+            'LogisticDistribution',
+            'LogisticSigmoid',
+            'LogitModelFit',
+            'LongLeftArrow',
+            'LongLeftRightArrow',
+            'LongRightArrow',
+            'Longest',
+            'LongestCommonSequence',
+            'LongestCommonSequencePositions',
+            'LongestCommonSubsequence',
+            'LongestCommonSubsequencePositions',
+            'LongestOrderedSequence',
+            'Longitude',
+            'Lookup',
+            'LoopFreeGraphQ',
+            'LowerCaseQ',
+            'LowerLeftArrow',
+            'LowerRightArrow',
+            'LowerTriangularize',
+            'LowpassFilter',
+            'LucasL',
+            'LuccioSamiComponents',
+            'LunarEclipse',
+            'LyapunovSolve',
+            'LyonsGroupLy',
+
+            'MAProcess',
+            'MachineNumberQ',
+            'MachinePrecision',
+            'Magenta',
+            'Magnification',
+            'Magnify',
+            'MailReceiverFunction',
+            'MailResponseFunction',
+            'Majority',
+            'MakeBoxes',
+            'MakeExpression',
+            'ManagedLibraryExpressionID',
+            'ManagedLibraryExpressionQ',
+            'MandelbrotSetBoettcher',
+            'MandelbrotSetDistance',
+            'MandelbrotSetIterationCount',
+            'MandelbrotSetMemberQ',
+            'MandelbrotSetPlot',
+            'MangoldtLambda',
+            'ManhattanDistance',
+            'Manipulate',
+            'Manipulator',
+            'MannWhitneyTest',
+            'MannedSpaceMissionData',
+            'MantissaExponent',
+            'Manual',
+            'Map',
+            'MapAll',
+            'MapAt',
+            'MapIndexed',
+            'MapThread',
+            'MarchenkoPasturDistribution',
+            'MarcumQ',
+            'MardiaCombinedTest',
+            'MardiaKurtosisTest',
+            'MardiaSkewnessTest',
+            'MarginalDistribution',
+            'MarkovProcessProperties',
+            'Masking',
+            'MatchLocalNames',
+            'MatchQ',
+            'MatchingDissimilarity',
+            'MathMLForm',
+            'MathematicalFunctionData',
+            'MathieuC',
+            'MathieuCPrime',
+            'MathieuCharacteristicA',
+            'MathieuCharacteristicB',
+            'MathieuCharacteristicExponent',
+            'MathieuGroupM11',
+            'MathieuGroupM12',
+            'MathieuGroupM22',
+            'MathieuGroupM23',
+            'MathieuGroupM24',
+            'MathieuS',
+            'MathieuSPrime',
+            'Matrices',
+            'MatrixExp',
+            'MatrixForm',
+            'MatrixFunction',
+            'MatrixLog',
+            'MatrixNormalDistribution',
+            'MatrixPlot',
+            'MatrixPower',
+            'MatrixPropertyDistribution',
+            'MatrixQ',
+            'MatrixRank',
+            'MatrixTDistribution',
+            'Max',
+            'MaxCellMeasure',
+            'MaxDetect',
+            'MaxExtraBandwidths',
+            'MaxExtraConditions',
+            'MaxFeatureDisplacement',
+            'MaxFeatures',
+            'MaxFilter',
+            'MaxItems',
+            'MaxIterations',
+            'MaxMemoryUsed',
+            'MaxMixtureKernels',
+            'MaxPlotPoints',
+            'MaxRecursion',
+            'MaxStableDistribution',
+            'MaxStepFraction',
+            'MaxStepSize',
+            'MaxSteps',
+            'MaxTrainingRounds',
+            'MaxValue',
+            'MaxWordGap',
+            'MaximalBy',
+            'Maximize',
+            'MaxwellDistribution',
+            'McLaughlinGroupMcL',
+            'Mean',
+            'MeanAbsoluteLossLayer',
+            'MeanClusteringCoefficient',
+            'MeanDegreeConnectivity',
+            'MeanDeviation',
+            'MeanFilter',
+            'MeanGraphDistance',
+            'MeanNeighborDegree',
+            'MeanShift',
+            'MeanShiftFilter',
+            'MeanSquaredLossLayer',
+            'Median',
+            'MedianDeviation',
+            'MedianFilter',
+            'MedicalTestData',
+            'Medium',
+            'MeijerG',
+            'MeijerGReduce',
+            'MeixnerDistribution',
+            'MellinConvolve',
+            'MellinTransform',
+            'MemberQ',
+            'MemoryConstrained',
+            'MemoryConstraint',
+            'MemoryInUse',
+            'MenuCommandKey',
+            'MenuPacket',
+            'MenuSortingValue',
+            'MenuStyle',
+            'MenuView',
+            'Merge',
+            'MersennePrimeExponent',
+            'MersennePrimeExponentQ',
+            'Mesh',
+            'MeshCellCentroid',
+            'MeshCellCount',
+            'MeshCellHighlight',
+            'MeshCellIndex',
+            'MeshCellLabel',
+            'MeshCellMarker',
+            'MeshCellMeasure',
+            'MeshCellQuality',
+            'MeshCellShapeFunction',
+            'MeshCellStyle',
+            'MeshCells',
+            'MeshCoordinates',
+            'MeshFunctions',
+            'MeshPrimitives',
+            'MeshQualityGoal',
+            'MeshRefinementFunction',
+            'MeshRegion',
+            'MeshRegionQ',
+            'MeshShading',
+            'MeshStyle',
+            'Message',
+            'MessageDialog',
+            'MessageList',
+            'MessageName',
+            'MessagePacket',
+            'Messages',
+            'MetaInformation',
+            'MeteorShowerData',
+            'Method',
+            'MexicanHatWavelet',
+            'MeyerWavelet',
+            'Min',
+            'MinColorDistance',
+            'MinDetect',
+            'MinFilter',
+            'MinIntervalSize',
+            'MinMax',
+            'MinStableDistribution',
+            'MinValue',
+            'MineralData',
+            'MinimalBy',
+            'MinimalPolynomial',
+            'MinimalStateSpaceModel',
+            'Minimize',
+            'MinimumTimeIncrement',
+            'MinkowskiQuestionMark',
+            'MinorPlanetData',
+            'Minors',
+            'Minus',
+            'MinusPlus',
+            'Missing',
+            'MissingBehavior',
+            'MissingDataMethod',
+            'MissingDataRules',
+            'MissingQ',
+            'MissingString',
+            'MissingStyle',
+            'MittagLefflerE',
+            'MixedGraphQ',
+            'MixedMagnitude',
+            'MixedRadix',
+            'MixedRadixQuantity',
+            'MixedUnit',
+            'MixtureDistribution',
+            'Mod',
+            'Modal',
+            'ModularLambda',
+            'Module',
+            'Modulus',
+            'MoebiusMu',
+            'Moment',
+            'MomentConvert',
+            'MomentEvaluate',
+            'MomentGeneratingFunction',
+            'MomentOfInertia',
+            'Monday',
+            'Monitor',
+            'MonomialList',
+            'MonsterGroupM',
+            'MoonPhase',
+            'MoonPosition',
+            'MorletWavelet',
+            'MorphologicalBinarize',
+            'MorphologicalBranchPoints',
+            'MorphologicalComponents',
+            'MorphologicalEulerNumber',
+            'MorphologicalGraph',
+            'MorphologicalPerimeter',
+            'MorphologicalTransform',
+            'MortalityData',
+            'Most',
+            'MountainData',
+            'MouseAnnotation',
+            'MouseAppearance',
+            'MousePosition',
+            'Mouseover',
+            'MovieData',
+            'MovingAverage',
+            'MovingMap',
+            'MovingMedian',
+            'MoyalDistribution',
+            'Multicolumn',
+            'MultiedgeStyle',
+            'MultigraphQ',
+            'Multinomial',
+            'MultinomialDistribution',
+            'MultinormalDistribution',
+            'MultiplicativeOrder',
+            'Multiselection',
+            'MultivariateHypergeometricDistribution',
+            'MultivariatePoissonDistribution',
+            'MultivariateTDistribution',
+
+            'N',
+            'NArgMax',
+            'NArgMin',
+            'NCache',
+            'NDEigensystem',
+            'NDEigenvalues',
+            'NDSolve',
+            'NDSolveValue',
+            'NExpectation',
+            'NHoldAll',
+            'NHoldFirst',
+            'NHoldRest',
+            'NIntegrate',
+            'NMaxValue',
+            'NMaximize',
+            'NMinValue',
+            'NMinimize',
+            'NProbability',
+            'NProduct',
+            'NRoots',
+            'NSolve',
+            'NSum',
+            'NakagamiDistribution',
+            'NameQ',
+            'Names',
+            'Nand',
+            'Nearest',
+            'NearestFunction',
+            'NearestNeighborGraph',
+            'NebulaData',
+            'NeedlemanWunschSimilarity',
+            'Needs',
+            'Negative',
+            'NegativeBinomialDistribution',
+            'NegativeDefiniteMatrixQ',
+            'NegativeMultinomialDistribution',
+            'NegativeSemidefiniteMatrixQ',
+            'NeighborhoodData',
+            'NeighborhoodGraph',
+            'Nest',
+            'NestGraph',
+            'NestList',
+            'NestWhile',
+            'NestWhileList',
+            'NestedGreaterGreater',
+            'NestedLessLess',
+            'NetChain',
+            'NetDecoder',
+            'NetEncoder',
+            'NetExtract',
+            'NetGraph',
+            'NetInitialize',
+            'NetPort',
+            'NetTrain',
+            'NeumannValue',
+            'NevilleThetaC',
+            'NevilleThetaD',
+            'NevilleThetaN',
+            'NevilleThetaS',
+            'NextCell',
+            'NextPrime',
+            'NextScheduledTaskTime',
+            'NicholsGridLines',
+            'NicholsPlot',
+            'NightHemisphere',
+            'NoWhitespace',
+            'NominalVariables',
+            'NonCommutativeMultiply',
+            'NonConstants',
+            'NonNegative',
+            'NonPositive',
+            'NoncentralBetaDistribution',
+            'NoncentralChiSquareDistribution',
+            'NoncentralFRatioDistribution',
+            'NoncentralStudentTDistribution',
+            'None',
+            'NoneTrue',
+            'NonlinearModelFit',
+            'NonlinearStateSpaceModel',
+            'NonlocalMeansFilter',
+            'Nor',
+            'NorlundB',
+            'Norm',
+            'NormFunction',
+            'Normal',
+            'NormalDistribution',
+            'NormalMatrixQ',
+            'Normalize',
+            'Normalized',
+            'NormalizedSquaredEuclideanDistance',
+            'NormalsFunction',
+            'Not',
+            'NotCongruent',
+            'NotCupCap',
+            'NotDoubleVerticalBar',
+            'NotElement',
+            'NotEqualTilde',
+            'NotExists',
+            'NotGreater',
+            'NotGreaterEqual',
+            'NotGreaterFullEqual',
+            'NotGreaterGreater',
+            'NotGreaterLess',
+            'NotGreaterSlantEqual',
+            'NotGreaterTilde',
+            'NotHumpDownHump',
+            'NotHumpEqual',
+            'NotLeftTriangle',
+            'NotLeftTriangleBar',
+            'NotLeftTriangleEqual',
+            'NotLess',
+            'NotLessEqual',
+            'NotLessFullEqual',
+            'NotLessGreater',
+            'NotLessLess',
+            'NotLessSlantEqual',
+            'NotLessTilde',
+            'NotNestedGreaterGreater',
+            'NotNestedLessLess',
+            'NotPrecedes',
+            'NotPrecedesEqual',
+            'NotPrecedesSlantEqual',
+            'NotPrecedesTilde',
+            'NotReverseElement',
+            'NotRightTriangle',
+            'NotRightTriangleBar',
+            'NotRightTriangleEqual',
+            'NotSquareSubset',
+            'NotSquareSubsetEqual',
+            'NotSquareSuperset',
+            'NotSquareSupersetEqual',
+            'NotSubset',
+            'NotSubsetEqual',
+            'NotSucceeds',
+            'NotSucceedsEqual',
+            'NotSucceedsSlantEqual',
+            'NotSucceedsTilde',
+            'NotSuperset',
+            'NotSupersetEqual',
+            'NotTilde',
+            'NotTildeEqual',
+            'NotTildeFullEqual',
+            'NotTildeTilde',
+            'NotVerticalBar',
+            'Notebook',
+            'NotebookApply',
+            'NotebookAutoSave',
+            'NotebookClose',
+            'NotebookDelete',
+            'NotebookDirectory',
+            'NotebookDynamicExpression',
+            'NotebookEvaluate',
+            'NotebookEventActions',
+            'NotebookFileName',
+            'NotebookFind',
+            'NotebookGet',
+            'NotebookImport',
+            'NotebookInformation',
+            'NotebookLocate',
+            'NotebookObject',
+            'NotebookOpen',
+            'NotebookPrint',
+            'NotebookPut',
+            'NotebookRead',
+            'NotebookSave',
+            'NotebookSelection',
+            'NotebookTemplate',
+            'NotebookWrite',
+            'Notebooks',
+            'Nothing',
+            'NotificationFunction',
+            'Now',
+            'NuclearExplosionData',
+            'NuclearReactorData',
+            'Null',
+            'NullRecords',
+            'NullSpace',
+            'NullWords',
+            'Number',
+            'NumberCompose',
+            'NumberDecompose',
+            'NumberExpand',
+            'NumberFieldClassNumber',
+            'NumberFieldDiscriminant',
+            'NumberFieldFundamentalUnits',
+            'NumberFieldIntegralBasis',
+            'NumberFieldNormRepresentatives',
+            'NumberFieldRegulator',
+            'NumberFieldRootsOfUnity',
+            'NumberFieldSignature',
+            'NumberForm',
+            'NumberFormat',
+            'NumberLinePlot',
+            'NumberMarks',
+            'NumberMultiplier',
+            'NumberPadding',
+            'NumberPoint',
+            'NumberQ',
+            'NumberSeparator',
+            'NumberSigns',
+            'NumberString',
+            'Numerator',
+            'NumericFunction',
+            'NumericQ',
+            'NuttallWindow',
+            'NyquistGridLines',
+            'NyquistPlot',
+
+            'O',
+            'ONanGroupON',
+            'ObservabilityGramian',
+            'ObservabilityMatrix',
+            'ObservableDecomposition',
+            'ObservableModelQ',
+            'OceanData',
+            'OddQ',
+            'Off',
+            'Offset',
+            'On',
+            'Once',
+            'OneIdentity',
+            'Opacity',
+            'OpacityFunction',
+            'OpacityFunctionScaling',
+            'OpenAppend',
+            'OpenRead',
+            'OpenWrite',
+            'Opener',
+            'OpenerView',
+            'Opening',
+            'Operate',
+            'OperatingSystem',
+            'OptimumFlowData',
+            'OptionValue',
+            'Optional',
+            'OptionalElement',
+            'Options',
+            'OptionsPattern',
+            'Or',
+            'Orange',
+            'Order',
+            'OrderDistribution',
+            'OrderedQ',
+            'Ordering',
+            'Orderless',
+            'OrderlessPatternSequence',
+            'OrnsteinUhlenbeckProcess',
+            'OrthogonalMatrixQ',
+            'Orthogonalize',
+            'Out',
+            'Outer',
+            'OutputControllabilityMatrix',
+            'OutputControllableModelQ',
+            'OutputForm',
+            'OutputNamePacket',
+            'OutputResponse',
+            'OutputSizeLimit',
+            'OutputStream',
+            'OverBar',
+            'OverDot',
+            'OverHat',
+            'OverTilde',
+            'OverVector',
+            'Overflow',
+            'Overlaps',
+            'Overlay',
+            'Overscript',
+            'OverscriptBox',
+            'OverscriptBoxOptions',
+            'OverwriteTarget',
+            'OwenT',
+            'OwnValues',
+
+            'PDF',
+            'PERTDistribution',
+            'PIDData',
+            'PIDDerivativeFilter',
+            'PIDFeedforward',
+            'PIDTune',
+            'PackingMethod',
+            'PadLeft',
+            'PadRight',
+            'PaddedForm',
+            'Padding',
+            'PaddingSize',
+            'PadeApproximant',
+            'PageBreakAbove',
+            'PageBreakBelow',
+            'PageBreakWithin',
+            'PageFooters',
+            'PageHeaders',
+            'PageRankCentrality',
+            'PageTheme',
+            'PageWidth',
+            'Pagination',
+            'PairedBarChart',
+            'PairedHistogram',
+            'PairedSmoothHistogram',
+            'PairedTTest',
+            'PairedZTest',
+            'PaletteNotebook',
+            'PalindromeQ',
+            'Pane',
+            'PaneSelector',
+            'Panel',
+            'Paneled',
+            'ParabolicCylinderD',
+            'ParagraphIndent',
+            'ParagraphSpacing',
+            'ParallelArray',
+            'ParallelCombine',
+            'ParallelDo',
+            'ParallelEvaluate',
+            'ParallelMap',
+            'ParallelNeeds',
+            'ParallelProduct',
+            'ParallelSubmit',
+            'ParallelSum',
+            'ParallelTable',
+            'ParallelTry',
+            'Parallelepiped',
+            'Parallelization',
+            'Parallelize',
+            'Parallelogram',
+            'ParameterEstimator',
+            'ParameterMixtureDistribution',
+            'ParametricFunction',
+            'ParametricNDSolve',
+            'ParametricNDSolveValue',
+            'ParametricPlot',
+            'ParametricPlot3D',
+            'ParametricRegion',
+            'ParentBox',
+            'ParentCell',
+            'ParentDirectory',
+            'ParentNotebook',
+            'ParetoDistribution',
+            'ParkData',
+            'Part',
+            'PartBehavior',
+            'PartOfSpeech',
+            'PartProtection',
+            'PartialCorrelationFunction',
+            'ParticleAcceleratorData',
+            'ParticleData',
+            'Partition',
+            'PartitionGranularity',
+            'PartitionsP',
+            'PartitionsQ',
+            'ParzenWindow',
+            'PascalDistribution',
+            'PassEventsDown',
+            'PassEventsUp',
+            'Paste',
+            'PasteButton',
+            'Path',
+            'PathGraph',
+            'PathGraphQ',
+            'Pattern',
+            'PatternSequence',
+            'PatternTest',
+            'PaulWavelet',
+            'PauliMatrix',
+            'Pause',
+            'PeakDetect',
+            'PearsonChiSquareTest',
+            'PearsonCorrelationTest',
+            'PearsonDistribution',
+            'PerfectNumber',
+            'PerfectNumberQ',
+            'PerformanceGoal',
+            'PeriodicBoundaryCondition',
+            'Periodogram',
+            'PeriodogramArray',
+            'Permanent',
+            'Permissions',
+            'PermissionsGroup',
+            'PermissionsGroups',
+            'PermissionsKey',
+            'PermissionsKeys',
+            'PermutationCycles',
+            'PermutationCyclesQ',
+            'PermutationGroup',
+            'PermutationLength',
+            'PermutationList',
+            'PermutationListQ',
+            'PermutationMax',
+            'PermutationMin',
+            'PermutationOrder',
+            'PermutationPower',
+            'PermutationProduct',
+            'PermutationReplace',
+            'PermutationSupport',
+            'Permutations',
+            'Permute',
+            'PeronaMalikFilter',
+            'PersonData',
+            'PetersenGraph',
+            'PhaseMargins',
+            'PhaseRange',
+            'PhysicalSystemData',
+            'Pi',
+            'Pick',
+            'PieChart',
+            'PieChart3D',
+            'Piecewise',
+            'PiecewiseExpand',
+            'PillaiTrace',
+            'PillaiTraceTest',
+            'PingTime',
+            'Pink',
+            'PixelConstrained',
+            'PixelValue',
+            'PixelValuePositions',
+            'Placed',
+            'Placeholder',
+            'PlaceholderReplace',
+            'Plain',
+            'PlanarGraph',
+            'PlanarGraphQ',
+            'PlanckRadiationLaw',
+            'PlaneCurveData',
+            'PlanetData',
+            'PlanetaryMoonData',
+            'PlantData',
+            'Play',
+            'PlayRange',
+            'Plot',
+            'Plot3D',
+            'PlotLabel',
+            'PlotLabels',
+            'PlotLayout',
+            'PlotLegends',
+            'PlotMarkers',
+            'PlotPoints',
+            'PlotRange',
+            'PlotRangeClipping',
+            'PlotRangePadding',
+            'PlotRegion',
+            'PlotStyle',
+            'PlotTheme',
+            'Pluralize',
+            'Plus',
+            'PlusMinus',
+            'Pochhammer',
+            'PodStates',
+            'PodWidth',
+            'Point',
+            'PointFigureChart',
+            'PointLegend',
+            'PointSize',
+            'PoissonConsulDistribution',
+            'PoissonDistribution',
+            'PoissonProcess',
+            'PoissonWindow',
+            'PolarAxes',
+            'PolarAxesOrigin',
+            'PolarGridLines',
+            'PolarPlot',
+            'PolarTicks',
+            'PoleZeroMarkers',
+            'PolyGamma',
+            'PolyLog',
+            'PolyaAeppliDistribution',
+            'Polygon',
+            'PolygonalNumber',
+            'PolyhedronData',
+            'PolynomialExtendedGCD',
+            'PolynomialGCD',
+            'PolynomialLCM',
+            'PolynomialMod',
+            'PolynomialQ',
+            'PolynomialQuotient',
+            'PolynomialQuotientRemainder',
+            'PolynomialReduce',
+            'PolynomialRemainder',
+            'PoolingLayer',
+            'PopupMenu',
+            'PopupView',
+            'PopupWindow',
+            'Position',
+            'PositionIndex',
+            'Positive',
+            'PositiveDefiniteMatrixQ',
+            'PositiveSemidefiniteMatrixQ',
+            'PossibleZeroQ',
+            'Postfix',
+            'Power',
+            'PowerDistribution',
+            'PowerExpand',
+            'PowerMod',
+            'PowerModList',
+            'PowerRange',
+            'PowerSpectralDensity',
+            'PowerSymmetricPolynomial',
+            'PowersRepresentations',
+            'PreDecrement',
+            'PreIncrement',
+            'PrecedenceForm',
+            'Precedes',
+            'PrecedesEqual',
+            'PrecedesSlantEqual',
+            'PrecedesTilde',
+            'Precision',
+            'PrecisionGoal',
+            'Predict',
+            'PredictorFunction',
+            'PredictorInformation',
+            'PredictorMeasurements',
+            'PredictorMeasurementsObject',
+            'PreemptProtect',
+            'Prefix',
+            'Prepend',
+            'PrependTo',
+            'PreserveImageOptions',
+            'PreviousCell',
+            'PriceGraphDistribution',
+            'Prime',
+            'PrimeNu',
+            'PrimeOmega',
+            'PrimePi',
+            'PrimePowerQ',
+            'PrimeQ',
+            'PrimeZetaP',
+            'Primes',
+            'PrimitiveRoot',
+            'PrimitiveRootList',
+            'PrincipalComponents',
+            'PrincipalValue',
+            'Print',
+            'PrintTemporary',
+            'PrintableASCIIQ',
+            'PrintingStyleEnvironment',
+            'Printout3D',
+            'Printout3DPreviewer',
+            'Prism',
+            'PrivateCellOptions',
+            'PrivateFontOptions',
+            'PrivateKey',
+            'PrivateNotebookOptions',
+            'Probability',
+            'ProbabilityDistribution',
+            'ProbabilityPlot',
+            'ProbabilityScalePlot',
+            'ProbitModelFit',
+            'ProcessConnection',
+            'ProcessDirectory',
+            'ProcessEnvironment',
+            'ProcessEstimator',
+            'ProcessInformation',
+            'ProcessObject',
+            'ProcessParameterAssumptions',
+            'ProcessParameterQ',
+            'ProcessStatus',
+            'Processes',
+            'Product',
+            'ProductDistribution',
+            'ProductLog',
+            'ProgressIndicator',
+            'Projection',
+            'Prolog',
+            'Properties',
+            'Property',
+            'PropertyList',
+            'PropertyValue',
+            'Proportion',
+            'Proportional',
+            'Protect',
+            'Protected',
+            'ProteinData',
+            'Pruning',
+            'PseudoInverse',
+            'PublicKey',
+            'PulsarData',
+            'PunctuationCharacter',
+            'Purple',
+            'Put',
+            'PutAppend',
+            'Pyramid',
+
+            'QBinomial',
+            'QFactorial',
+            'QGamma',
+            'QHypergeometricPFQ',
+            'QPochhammer',
+            'QPolyGamma',
+            'QRDecomposition',
+            'QuadraticIrrationalQ',
+            'Quantile',
+            'QuantilePlot',
+            'Quantity',
+            'QuantityArray',
+            'QuantityDistribution',
+            'QuantityForm',
+            'QuantityMagnitude',
+            'QuantityQ',
+            'QuantityUnit',
+            'QuantityVariable',
+            'QuantityVariableCanonicalUnit',
+            'QuantityVariableDimensions',
+            'QuantityVariableIdentifier',
+            'QuantityVariablePhysicalQuantity',
+            'Quartics',
+            'QuartileDeviation',
+            'QuartileSkewness',
+            'Quartiles',
+            'Query',
+            'QueueProperties',
+            'QueueingNetworkProcess',
+            'QueueingProcess',
+            'Quiet',
+            'Quit',
+            'Quotient',
+            'QuotientRemainder',
+
+            'RGBColor',
+            'RSolve',
+            'RSolveValue',
+            'RadialGradientImage',
+            'RadialityCentrality',
+            'RadicalBox',
+            'RadicalBoxOptions',
+            'RadioButton',
+            'RadioButtonBar',
+            'Radon',
+            'RamanujanTau',
+            'RamanujanTauL',
+            'RamanujanTauTheta',
+            'RamanujanTauZ',
+            'Ramp',
+            'RandomChoice',
+            'RandomColor',
+            'RandomComplex',
+            'RandomEntity',
+            'RandomFunction',
+            'RandomGraph',
+            'RandomImage',
+            'RandomInteger',
+            'RandomPermutation',
+            'RandomPoint',
+            'RandomPrime',
+            'RandomReal',
+            'RandomSample',
+            'RandomVariate',
+            'RandomWalkProcess',
+            'RandomWord',
+            'Range',
+            'RangeFilter',
+            'RankedMax',
+            'RankedMin',
+            'Raster',
+            'Raster3D',
+            'RasterSize',
+            'Rasterize',
+            'Rational',
+            'Rationalize',
+            'Rationals',
+            'Ratios',
+            'RawBoxes',
+            'RawData',
+            'RayleighDistribution',
+            'Re',
+            'ReIm',
+            'Read',
+            'ReadLine',
+            'ReadList',
+            'ReadProtected',
+            'ReadString',
+            'Real',
+            'RealBlockDiagonalForm',
+            'RealDigits',
+            'RealExponent',
+            'Reals',
+            'Reap',
+            'RecognitionPrior',
+            'RecognitionThreshold',
+            'Record',
+            'RecordLists',
+            'RecordSeparators',
+            'Rectangle',
+            'RectangleChart',
+            'RectangleChart3D',
+            'RecurrenceFilter',
+            'RecurrenceTable',
+            'Red',
+            'Reduce',
+            'ReferenceLineStyle',
+            'Refine',
+            'ReflectionMatrix',
+            'ReflectionTransform',
+            'Refresh',
+            'RefreshRate',
+            'RegionBinarize',
+            'RegionBoundary',
+            'RegionBounds',
+            'RegionCentroid',
+            'RegionDifference',
+            'RegionDimension',
+            'RegionDistance',
+            'RegionDistanceFunction',
+            'RegionEmbeddingDimension',
+            'RegionFunction',
+            'RegionIntersection',
+            'RegionMeasure',
+            'RegionMember',
+            'RegionMemberFunction',
+            'RegionMoment',
+            'RegionNearest',
+            'RegionNearestFunction',
+            'RegionPlot',
+            'RegionPlot3D',
+            'RegionProduct',
+            'RegionQ',
+            'RegionResize',
+            'RegionSize',
+            'RegionSymmetricDifference',
+            'RegionUnion',
+            'RegularExpression',
+            'RegularPolygon',
+            'Regularization',
+            'RegularlySampledQ',
+            'RelationGraph',
+            'ReleaseHold',
+            'ReliabilityDistribution',
+            'ReliefImage',
+            'ReliefPlot',
+            'Remove',
+            'RemoveAlphaChannel',
+            'RemoveAsynchronousTask',
+            'RemoveBackground',
+            'RemoveChannelListener',
+            'RemoveDiacritics',
+            'RemoveInputStreamMethod',
+            'RemoveOutputStreamMethod',
+            'RemoveProperty',
+            'RemoveScheduledTask',
+            'RemoveUsers',
+            'RenameDirectory',
+            'RenameFile',
+            'RenewalProcess',
+            'RenkoChart',
+            'RepairMesh',
+            'Repeated',
+            'RepeatedNull',
+            'RepeatedTiming',
+            'RepeatingElement',
+            'Replace',
+            'ReplaceAll',
+            'ReplaceImageValue',
+            'ReplaceList',
+            'ReplacePart',
+            'ReplacePixelValue',
+            'ReplaceRepeated',
+            'RequiredPhysicalQuantities',
+            'Resampling',
+            'ResamplingAlgorithmData',
+            'ResamplingMethod',
+            'Rescale',
+            'RescalingTransform',
+            'ResetDirectory',
+            'ResetScheduledTask',
+            'ReshapeLayer',
+            'Residue',
+            'Resolve',
+            'ResourceData',
+            'ResourceObject',
+            'ResourceRemove',
+            'ResourceSearch',
+            'ResponseForm',
+            'Rest',
+            'RestartInterval',
+            'Restricted',
+            'Resultant',
+            'Return',
+            'ReturnExpressionPacket',
+            'ReturnPacket',
+            'ReturnReceiptFunction',
+            'ReturnTextPacket',
+            'Reverse',
+            'ReverseBiorthogonalSplineWavelet',
+            'ReverseElement',
+            'ReverseEquilibrium',
+            'ReverseGraph',
+            'ReverseUpEquilibrium',
+            'RevolutionAxis',
+            'RevolutionPlot3D',
+            'RiccatiSolve',
+            'RiceDistribution',
+            'RidgeFilter',
+            'RiemannR',
+            'RiemannSiegelTheta',
+            'RiemannSiegelZ',
+            'RiemannXi',
+            'Riffle',
+            'Right',
+            'RightArrow',
+            'RightArrowBar',
+            'RightArrowLeftArrow',
+            'RightComposition',
+            'RightCosetRepresentative',
+            'RightDownTeeVector',
+            'RightDownVector',
+            'RightDownVectorBar',
+            'RightTee',
+            'RightTeeArrow',
+            'RightTeeVector',
+            'RightTriangle',
+            'RightTriangleBar',
+            'RightTriangleEqual',
+            'RightUpDownVector',
+            'RightUpTeeVector',
+            'RightUpVector',
+            'RightUpVectorBar',
+            'RightVector',
+            'RightVectorBar',
+            'RiskAchievementImportance',
+            'RiskReductionImportance',
+            'RogersTanimotoDissimilarity',
+            'RollPitchYawAngles',
+            'RollPitchYawMatrix',
+            'RomanNumeral',
+            'Root',
+            'RootApproximant',
+            'RootIntervals',
+            'RootLocusPlot',
+            'RootMeanSquare',
+            'RootOfUnityQ',
+            'RootReduce',
+            'RootSum',
+            'Roots',
+            'Rotate',
+            'RotateLabel',
+            'RotateLeft',
+            'RotateRight',
+            'RotationAction',
+            'RotationMatrix',
+            'RotationTransform',
+            'Round',
+            'RoundingRadius',
+            'Row',
+            'RowAlignments',
+            'RowBox',
+            'RowLines',
+            'RowMinHeight',
+            'RowReduce',
+            'RowSpacings',
+            'RowsEqual',
+            'RudinShapiro',
+            'RudvalisGroupRu',
+            'Rule',
+            'RuleDelayed',
+            'RulePlot',
+            'Run',
+            'RunProcess',
+            'RunScheduledTask',
+            'RunThrough',
+            'RuntimeAttributes',
+            'RuntimeOptions',
+            'RussellRaoDissimilarity',
+
+            'SARIMAProcess',
+            'SARMAProcess',
+            'SASTriangle',
+            'SSSTriangle',
+            'SameQ',
+            'SameTest',
+            'SampleDepth',
+            'SampleRate',
+            'SampledSoundFunction',
+            'SampledSoundList',
+            'SamplingPeriod',
+            'SatelliteData',
+            'SatisfiabilityCount',
+            'SatisfiabilityInstances',
+            'SatisfiableQ',
+            'Saturday',
+            'Save',
+            'SaveDefinitions',
+            'SavitzkyGolayMatrix',
+            'SawtoothWave',
+            'Scale',
+            'ScaleDivisions',
+            'ScaleOrigin',
+            'ScalePadding',
+            'ScaleRangeStyle',
+            'ScaleRanges',
+            'Scaled',
+            'ScalingFunctions',
+            'ScalingMatrix',
+            'ScalingTransform',
+            'Scan',
+            'ScheduledTask',
+            'ScheduledTaskActiveQ',
+            'ScheduledTaskInformation',
+            'ScheduledTaskObject',
+            'ScheduledTasks',
+            'SchurDecomposition',
+            'ScientificForm',
+            'ScorerGi',
+            'ScorerGiPrime',
+            'ScorerHi',
+            'ScorerHiPrime',
+            'ScreenStyleEnvironment',
+            'ScriptBaselineShifts',
+            'ScriptMinSize',
+            'ScriptSizeMultipliers',
+            'ScrollPosition',
+            'Scrollbars',
+            'ScrollingOptions',
+            'SearchAdjustment',
+            'SearchIndexObject',
+            'SearchIndices',
+            'SearchQueryString',
+            'SearchResultObject',
+            'Sec',
+            'Sech',
+            'SechDistribution',
+            'SectorChart',
+            'SectorChart3D',
+            'SectorOrigin',
+            'SectorSpacing',
+            'SeedRandom',
+            'Select',
+            'SelectComponents',
+            'SelectFirst',
+            'Selectable',
+            'SelectedCells',
+            'SelectedNotebook',
+            'SelectionCreateCell',
+            'SelectionEvaluate',
+            'SelectionEvaluateCreateCell',
+            'SelectionMove',
+            'SelfLoopStyle',
+            'SemanticImport',
+            'SemanticImportString',
+            'SemanticInterpretation',
+            'SemialgebraicComponentInstances',
+            'SendMail',
+            'SendMessage',
+            'Sequence',
+            'SequenceAlignment',
+            'SequenceCases',
+            'SequenceCount',
+            'SequenceFold',
+            'SequenceFoldList',
+            'SequenceHold',
+            'SequencePosition',
+            'Series',
+            'SeriesCoefficient',
+            'SeriesData',
+            'ServiceConnect',
+            'ServiceDisconnect',
+            'ServiceExecute',
+            'ServiceObject',
+            'SessionTime',
+            'Set',
+            'SetAccuracy',
+            'SetAlphaChannel',
+            'SetAttributes',
+            'SetCloudDirectory',
+            'SetCookies',
+            'SetDelayed',
+            'SetDirectory',
+            'SetEnvironment',
+            'SetFileDate',
+            'SetOptions',
+            'SetPermissions',
+            'SetPrecision',
+            'SetProperty',
+            'SetSelectedNotebook',
+            'SetSharedFunction',
+            'SetSharedVariable',
+            'SetStreamPosition',
+            'SetSystemOptions',
+            'SetUsers',
+            'Setter',
+            'SetterBar',
+            'Setting',
+            'Shallow',
+            'ShannonWavelet',
+            'ShapiroWilkTest',
+            'Share',
+            'Sharpen',
+            'ShearingMatrix',
+            'ShearingTransform',
+            'ShellRegion',
+            'ShenCastanMatrix',
+            'ShiftRegisterSequence',
+            'ShiftedGompertzDistribution',
+            'Short',
+            'ShortDownArrow',
+            'ShortLeftArrow',
+            'ShortRightArrow',
+            'ShortUpArrow',
+            'Shortest',
+            'ShortestPathFunction',
+            'Show',
+            'ShowAutoSpellCheck',
+            'ShowAutoStyles',
+            'ShowCellBracket',
+            'ShowCellLabel',
+            'ShowCellTags',
+            'ShowCursorTracker',
+            'ShowGroupOpener',
+            'ShowPageBreaks',
+            'ShowSelection',
+            'ShowSpecialCharacters',
+            'ShowStringCharacters',
+            'ShrinkingDelay',
+            'SiderealTime',
+            'SiegelTheta',
+            'SiegelTukeyTest',
+            'Sign',
+            'SignPadding',
+            'SignTest',
+            'Signature',
+            'SignedRankTest',
+            'SignedRegionDistance',
+            'SignificanceLevel',
+            'SimilarityRules',
+            'SimpleGraph',
+            'SimpleGraphQ',
+            'Simplex',
+            'Simplify',
+            'Sin',
+            'SinIntegral',
+            'Sinc',
+            'SinghMaddalaDistribution',
+            'SingleLetterItalics',
+            'SingularValueDecomposition',
+            'SingularValueList',
+            'SingularValuePlot',
+            'Sinh',
+            'SinhIntegral',
+            'SixJSymbol',
+            'Skeleton',
+            'SkeletonTransform',
+            'SkellamDistribution',
+            'SkewNormalDistribution',
+            'Skewness',
+            'SkinStyle',
+            'Skip',
+            'SliceContourPlot3D',
+            'SliceDensityPlot3D',
+            'SliceDistribution',
+            'SliceVectorPlot3D',
+            'SlideView',
+            'Slider',
+            'Slider2D',
+            'Slot',
+            'SlotSequence',
+            'Small',
+            'SmallCircle',
+            'Smaller',
+            'SmithDecomposition',
+            'SmithDelayCompensator',
+            'SmithWatermanSimilarity',
+            'SmoothDensityHistogram',
+            'SmoothHistogram',
+            'SmoothHistogram3D',
+            'SmoothKernelDistribution',
+            'Snippet',
+            'SocialMediaData',
+            'SocketConnect',
+            'SocketObject',
+            'SoftmaxLayer',
+            'SokalSneathDissimilarity',
+            'SolarEclipse',
+            'SolarSystemFeatureData',
+            'SolidData',
+            'SolidRegionQ',
+            'Solve',
+            'SolveAlways',
+            'Sort',
+            'SortBy',
+            'Sound',
+            'SoundNote',
+            'SoundVolume',
+            'SourceLink',
+            'Sow',
+            'SpaceCurveData',
+            'Spacer',
+            'Spacings',
+            'Span',
+            'SpanFromAbove',
+            'SpanFromBoth',
+            'SpanFromLeft',
+            'SparseArray',
+            'SpatialGraphDistribution',
+            'Speak',
+            'SpearmanRankTest',
+            'SpearmanRho',
+            'SpeciesData',
+            'SpecificityGoal',
+            'Spectrogram',
+            'SpectrogramArray',
+            'Specularity',
+            'SpellingCorrection',
+            'SpellingCorrectionList',
+            'SpellingOptions',
+            'Sphere',
+            'SphericalBesselJ',
+            'SphericalBesselY',
+            'SphericalHankelH1',
+            'SphericalHankelH2',
+            'SphericalHarmonicY',
+            'SphericalPlot3D',
+            'SphericalRegion',
+            'SphericalShell',
+            'SpheroidalEigenvalue',
+            'SpheroidalJoiningFactor',
+            'SpheroidalPS',
+            'SpheroidalPSPrime',
+            'SpheroidalQS',
+            'SpheroidalQSPrime',
+            'SpheroidalRadialFactor',
+            'SpheroidalS1',
+            'SpheroidalS1Prime',
+            'SpheroidalS2',
+            'SpheroidalS2Prime',
+            'SplicedDistribution',
+            'SplineClosed',
+            'SplineDegree',
+            'SplineKnots',
+            'SplineWeights',
+            'Split',
+            'SplitBy',
+            'SpokenString',
+            'Sqrt',
+            'SqrtBox',
+            'SqrtBoxOptions',
+            'Square',
+            'SquareFreeQ',
+            'SquareIntersection',
+            'SquareMatrixQ',
+            'SquareSubset',
+            'SquareSubsetEqual',
+            'SquareSuperset',
+            'SquareSupersetEqual',
+            'SquareUnion',
+            'SquareWave',
+            'SquaredEuclideanDistance',
+            'SquaresR',
+            'StabilityMargins',
+            'StabilityMarginsStyle',
+            'StableDistribution',
+            'Stack',
+            'StackBegin',
+            'StackComplete',
+            'StackInhibit',
+            'StadiumShape',
+            'StandardAtmosphereData',
+            'StandardDeviation',
+            'StandardDeviationFilter',
+            'StandardForm',
+            'StandardOceanData',
+            'Standardize',
+            'Standardized',
+            'StandbyDistribution',
+            'Star',
+            'StarClusterData',
+            'StarData',
+            'StarGraph',
+            'StartAsynchronousTask',
+            'StartOfLine',
+            'StartOfString',
+            'StartProcess',
+            'StartScheduledTask',
+            'StartingStepSize',
+            'StateFeedbackGains',
+            'StateOutputEstimator',
+            'StateResponse',
+            'StateSpaceModel',
+            'StateSpaceRealization',
+            'StateSpaceTransform',
+            'StateTransformationLinearize',
+            'StationaryDistribution',
+            'StationaryWaveletPacketTransform',
+            'StationaryWaveletTransform',
+            'StatusArea',
+            'StatusCentrality',
+            'StepMonitor',
+            'StieltjesGamma',
+            'StirlingS1',
+            'StirlingS2',
+            'StopAsynchronousTask',
+            'StopScheduledTask',
+            'StoppingPowerData',
+            'StrataVariables',
+            'StratonovichProcess',
+            'StreamColorFunction',
+            'StreamColorFunctionScaling',
+            'StreamDensityPlot',
+            'StreamPlot',
+            'StreamPoints',
+            'StreamPosition',
+            'StreamScale',
+            'StreamStyle',
+            'Streams',
+            'String',
+            'StringCases',
+            'StringContainsQ',
+            'StringCount',
+            'StringDelete',
+            'StringDrop',
+            'StringEndsQ',
+            'StringExpression',
+            'StringExtract',
+            'StringForm',
+            'StringFormat',
+            'StringFreeQ',
+            'StringInsert',
+            'StringJoin',
+            'StringLength',
+            'StringMatchQ',
+            'StringPadLeft',
+            'StringPadRight',
+            'StringPart',
+            'StringPartition',
+            'StringPosition',
+            'StringQ',
+            'StringRepeat',
+            'StringReplace',
+            'StringReplaceList',
+            'StringReplacePart',
+            'StringReverse',
+            'StringRiffle',
+            'StringRotateLeft',
+            'StringRotateRight',
+            'StringSkeleton',
+            'StringSplit',
+            'StringStartsQ',
+            'StringTake',
+            'StringTemplate',
+            'StringToStream',
+            'StringTrim',
+            'StripBoxes',
+            'StripOnInput',
+            'StripWrapperBoxes',
+            'StructuralImportance',
+            'StructuredArray',
+            'StructuredSelection',
+            'StruveH',
+            'StruveL',
+            'Stub',
+            'StudentTDistribution',
+            'Style',
+            'StyleBox',
+            'StyleData',
+            'StyleDefinitions',
+            'SubMinus',
+            'SubPlus',
+            'SubStar',
+            'Subdivide',
+            'Subfactorial',
+            'Subgraph',
+            'SubresultantPolynomialRemainders',
+            'SubresultantPolynomials',
+            'Subresultants',
+            'Subscript',
+            'SubscriptBox',
+            'SubscriptBoxOptions',
+            'Subsequences',
+            'Subset',
+            'SubsetEqual',
+            'SubsetQ',
+            'Subsets',
+            'SubstitutionSystem',
+            'Subsuperscript',
+            'SubsuperscriptBox',
+            'SubsuperscriptBoxOptions',
+            'Subtract',
+            'SubtractFrom',
+            'Succeeds',
+            'SucceedsEqual',
+            'SucceedsSlantEqual',
+            'SucceedsTilde',
+            'SuchThat',
+            'Sum',
+            'SumConvergence',
+            'SummationLayer',
+            'SunPosition',
+            'Sunday',
+            'Sunrise',
+            'Sunset',
+            'SuperDagger',
+            'SuperMinus',
+            'SuperPlus',
+            'SuperStar',
+            'SupernovaData',
+            'Superscript',
+            'SuperscriptBox',
+            'SuperscriptBoxOptions',
+            'Superset',
+            'SupersetEqual',
+            'Surd',
+            'SurfaceData',
+            'SurvivalDistribution',
+            'SurvivalFunction',
+            'SurvivalModel',
+            'SurvivalModelFit',
+            'SuzukiDistribution',
+            'SuzukiGroupSuz',
+            'SwatchLegend',
+            'Switch',
+            'Symbol',
+            'SymbolName',
+            'SymletWavelet',
+            'Symmetric',
+            'SymmetricGroup',
+            'SymmetricKey',
+            'SymmetricMatrixQ',
+            'SymmetricPolynomial',
+            'SymmetricReduction',
+            'Symmetrize',
+            'SymmetrizedArray',
+            'SymmetrizedArrayRules',
+            'SymmetrizedDependentComponents',
+            'SymmetrizedIndependentComponents',
+            'SymmetrizedReplacePart',
+            'SynchronousInitialization',
+            'SynchronousUpdating',
+            'SyntaxForm',
+            'SyntaxInformation',
+            'SyntaxLength',
+            'SyntaxPacket',
+            'SyntaxQ',
+            'SystemDialogInput',
+            'SystemInformation',
+            'SystemOpen',
+            'SystemOptions',
+            'SystemsModelDelay',
+            'SystemsModelDelayApproximate',
+            'SystemsModelDelete',
+            'SystemsModelDimensions',
+            'SystemsModelExtract',
+            'SystemsModelFeedbackConnect',
+            'SystemsModelLabels',
+            'SystemsModelLinearity',
+            'SystemsModelMerge',
+            'SystemsModelOrder',
+            'SystemsModelParallelConnect',
+            'SystemsModelSeriesConnect',
+            'SystemsModelStateFeedbackConnect',
+            'SystemsModelVectorRelativeOrders',
+
+            'TTest',
+            'TabView',
+            'Table',
+            'TableAlignments',
+            'TableDepth',
+            'TableDirections',
+            'TableForm',
+            'TableHeadings',
+            'TableSpacing',
+            'TagBox',
+            'TagBoxOptions',
+            'TagSet',
+            'TagSetDelayed',
+            'TagUnset',
+            'TaggingRules',
+            'Take',
+            'TakeDrop',
+            'TakeLargest',
+            'TakeLargestBy',
+            'TakeSmallest',
+            'TakeSmallestBy',
+            'TakeWhile',
+            'Tally',
+            'Tan',
+            'Tanh',
+            'TargetDevice',
+            'TargetFunctions',
+            'TargetUnits',
+            'TautologyQ',
+            'TeXForm',
+            'TelegraphProcess',
+            'TemplateApply',
+            'TemplateBox',
+            'TemplateBoxOptions',
+            'TemplateExpression',
+            'TemplateIf',
+            'TemplateObject',
+            'TemplateSequence',
+            'TemplateSlot',
+            'TemplateWith',
+            'TemporalData',
+            'TemporalRegularity',
+            'Temporary',
+            'TensorContract',
+            'TensorDimensions',
+            'TensorExpand',
+            'TensorProduct',
+            'TensorRank',
+            'TensorReduce',
+            'TensorSymmetry',
+            'TensorTranspose',
+            'TensorWedge',
+            'TestID',
+            'TestReport',
+            'TestReportObject',
+            'TestResultObject',
+            'Tetrahedron',
+            'Text',
+            'TextAlignment',
+            'TextCases',
+            'TextCell',
+            'TextClipboardType',
+            'TextData',
+            'TextElement',
+            'TextGrid',
+            'TextJustification',
+            'TextPacket',
+            'TextPosition',
+            'TextRecognize',
+            'TextSearch',
+            'TextSearchReport',
+            'TextSentences',
+            'TextString',
+            'TextStructure',
+            'TextWords',
+            'Texture',
+            'TextureCoordinateFunction',
+            'TextureCoordinateScaling',
+            'Therefore',
+            'ThermodynamicData',
+            'ThermometerGauge',
+            'Thick',
+            'Thickness',
+            'Thin',
+            'Thinning',
+            'ThompsonGroupTh',
+            'Thread',
+            'ThreeJSymbol',
+            'Threshold',
+            'Through',
+            'Throw',
+            'ThueMorse',
+            'Thumbnail',
+            'Thursday',
+            'Ticks',
+            'TicksStyle',
+            'Tilde',
+            'TildeEqual',
+            'TildeFullEqual',
+            'TildeTilde',
+            'TimeConstrained',
+            'TimeConstraint',
+            'TimeDirection',
+            'TimeFormat',
+            'TimeObject',
+            'TimeObjectQ',
+            'TimeSeries',
+            'TimeSeriesAggregate',
+            'TimeSeriesForecast',
+            'TimeSeriesInsert',
+            'TimeSeriesInvertibility',
+            'TimeSeriesMap',
+            'TimeSeriesMapThread',
+            'TimeSeriesModel',
+            'TimeSeriesModelFit',
+            'TimeSeriesResample',
+            'TimeSeriesRescale',
+            'TimeSeriesShift',
+            'TimeSeriesThread',
+            'TimeSeriesWindow',
+            'TimeUsed',
+            'TimeValue',
+            'TimeZone',
+            'TimeZoneConvert',
+            'TimeZoneOffset',
+            'TimelinePlot',
+            'Times',
+            'TimesBy',
+            'Timing',
+            'Tiny',
+            'TitsGroupT',
+            'ToBoxes',
+            'ToCharacterCode',
+            'ToContinuousTimeModel',
+            'ToDiscreteTimeModel',
+            'ToEntity',
+            'ToExpression',
+            'ToInvertibleTimeSeries',
+            'ToLowerCase',
+            'ToNumberField',
+            'ToPolarCoordinates',
+            'ToRadicals',
+            'ToRules',
+            'ToSphericalCoordinates',
+            'ToString',
+            'ToUpperCase',
+            'Today',
+            'ToeplitzMatrix',
+            'Together',
+            'Toggler',
+            'TogglerBar',
+            'TokenWords',
+            'Tolerance',
+            'Tomorrow',
+            'Tooltip',
+            'TooltipDelay',
+            'TooltipStyle',
+            'Top',
+            'TopHatTransform',
+            'TopologicalSort',
+            'Total',
+            'TotalLayer',
+            'TotalVariationFilter',
+            'TotalWidth',
+            'TouchPosition',
+            'TouchscreenAutoZoom',
+            'TouchscreenControlPlacement',
+            'Tr',
+            'Trace',
+            'TraceAbove',
+            'TraceBackward',
+            'TraceDepth',
+            'TraceDialog',
+            'TraceForward',
+            'TraceOff',
+            'TraceOn',
+            'TraceOriginal',
+            'TracePrint',
+            'TraceScan',
+            'TrackedSymbols',
+            'TrackingFunction',
+            'TracyWidomDistribution',
+            'TradingChart',
+            'TraditionalForm',
+            'TransferFunctionCancel',
+            'TransferFunctionExpand',
+            'TransferFunctionFactor',
+            'TransferFunctionModel',
+            'TransferFunctionPoles',
+            'TransferFunctionTransform',
+            'TransferFunctionZeros',
+            'TransformationClass',
+            'TransformationFunction',
+            'TransformationFunctions',
+            'TransformationMatrix',
+            'TransformedDistribution',
+            'TransformedField',
+            'TransformedProcess',
+            'TransformedRegion',
+            'TransitionDirection',
+            'TransitionDuration',
+            'TransitionEffect',
+            'TransitiveClosureGraph',
+            'TransitiveReductionGraph',
+            'Translate',
+            'TranslationOptions',
+            'TranslationTransform',
+            'Transliterate',
+            'Transparent',
+            'Transpose',
+            'TravelDirections',
+            'TravelDirectionsData',
+            'TravelDistance',
+            'TravelDistanceList',
+            'TravelMethod',
+            'TravelTime',
+            'TreeForm',
+            'TreeGraph',
+            'TreeGraphQ',
+            'TreePlot',
+            'TrendStyle',
+            'Triangle',
+            'TriangleWave',
+            'TriangularDistribution',
+            'TriangulateMesh',
+            'Trig',
+            'TrigExpand',
+            'TrigFactor',
+            'TrigFactorList',
+            'TrigReduce',
+            'TrigToExp',
+            'Trigger',
+            'TrimmedMean',
+            'TropicalStormData',
+            'True',
+            'TrueQ',
+            'TruncatedDistribution',
+            'TsallisQExponentialDistribution',
+            'TsallisQGaussianDistribution',
+            'Tube',
+            'Tuesday',
+            'TukeyLambdaDistribution',
+            'TukeyWindow',
+            'TunnelData',
+            'Tuples',
+            'TuranGraph',
+            'TuringMachine',
+            'TuttePolynomial',
+
+            'URL',
+            'URLBuild',
+            'URLDecode',
+            'URLDispatcher',
+            'URLDownload',
+            'URLEncode',
+            'URLExecute',
+            'URLExpand',
+            'URLParse',
+            'URLQueryDecode',
+            'URLQueryEncode',
+            'URLRead',
+            'URLSaveAsynchronous',
+            'URLShorten',
+            'URLSubmit',
+            'UnateQ',
+            'Uncompress',
+            'Undefined',
+            'UnderBar',
+            'Underflow',
+            'Underlined',
+            'Underoverscript',
+            'UnderoverscriptBox',
+            'UnderoverscriptBoxOptions',
+            'Underscript',
+            'UnderscriptBox',
+            'UnderscriptBoxOptions',
+            'UnderseaFeatureData',
+            'UndirectedEdge',
+            'UndirectedGraph',
+            'UndirectedGraphQ',
+            'UndoOptions',
+            'UndoTrackedVariables',
+            'Unequal',
+            'UnequalTo',
+            'Unevaluated',
+            'UniformDistribution',
+            'UniformGraphDistribution',
+            'UniformSumDistribution',
+            'Uninstall',
+            'Union',
+            'UnionPlus',
+            'Unique',
+            'UnitBox',
+            'UnitConvert',
+            'UnitDimensions',
+            'UnitRootTest',
+            'UnitSimplify',
+            'UnitStep',
+            'UnitSystem',
+            'UnitTriangle',
+            'UnitVector',
+            'UnitaryMatrixQ',
+            'Unitize',
+            'UnityDimensions',
+            'UniverseModelData',
+            'UniversityData',
+            'UnixTime',
+            'Unprotect',
+            'UnsameQ',
+            'UnsavedVariables',
+            'Unset',
+            'UnsetShared',
+            'UpArrow',
+            'UpArrowBar',
+            'UpArrowDownArrow',
+            'UpDownArrow',
+            'UpEquilibrium',
+            'UpSet',
+            'UpSetDelayed',
+            'UpTee',
+            'UpTeeArrow',
+            'UpTo',
+            'UpValues',
+            'Update',
+            'UpdateInterval',
+            'UpdateSearchIndex',
+            'UpperCaseQ',
+            'UpperLeftArrow',
+            'UpperRightArrow',
+            'UpperTriangularize',
+            'Upsample',
+            'UsingFrontEnd',
+            'UtilityFunction',
+
+            'ValidationLength',
+            'ValidationSet',
+            'ValueDimensions',
+            'ValueQ',
+            'Values',
+            'Variables',
+            'Variance',
+            'VarianceEquivalenceTest',
+            'VarianceEstimatorFunction',
+            'VarianceGammaDistribution',
+            'VarianceTest',
+            'VectorAngle',
+            'VectorColorFunction',
+            'VectorColorFunctionScaling',
+            'VectorDensityPlot',
+            'VectorPlot',
+            'VectorPlot3D',
+            'VectorPoints',
+            'VectorQ',
+            'VectorScale',
+            'VectorStyle',
+            'Vectors',
+            'Vee',
+            'Verbatim',
+            'VerificationTest',
+            'VerifyConvergence',
+            'VerifySecurityCertificates',
+            'VerifySolutions',
+            'VerifyTestAssumptions',
+            'VertexAdd',
+            'VertexCapacity',
+            'VertexColors',
+            'VertexComponent',
+            'VertexConnectivity',
+            'VertexContract',
+            'VertexCoordinateRules',
+            'VertexCoordinates',
+            'VertexCorrelationSimilarity',
+            'VertexCosineSimilarity',
+            'VertexCount',
+            'VertexCoverQ',
+            'VertexDataCoordinates',
+            'VertexDegree',
+            'VertexDelete',
+            'VertexDiceSimilarity',
+            'VertexEccentricity',
+            'VertexInComponent',
+            'VertexInDegree',
+            'VertexIndex',
+            'VertexJaccardSimilarity',
+            'VertexLabelStyle',
+            'VertexLabeling',
+            'VertexLabels',
+            'VertexList',
+            'VertexNormals',
+            'VertexOutComponent',
+            'VertexOutDegree',
+            'VertexQ',
+            'VertexRenderingFunction',
+            'VertexReplace',
+            'VertexShape',
+            'VertexShapeFunction',
+            'VertexSize',
+            'VertexStyle',
+            'VertexTextureCoordinates',
+            'VertexWeight',
+            'VerticalBar',
+            'VerticalGauge',
+            'VerticalSeparator',
+            'VerticalSlider',
+            'VerticalTilde',
+            'ViewAngle',
+            'ViewCenter',
+            'ViewMatrix',
+            'ViewPoint',
+            'ViewRange',
+            'ViewVector',
+            'ViewVertical',
+            'Visible',
+            'VoigtDistribution',
+            'VolcanoData',
+            'Volume',
+            'VonMisesDistribution',
+            'VoronoiMesh',
+
+            'WaitAll',
+            'WaitAsynchronousTask',
+            'WaitNext',
+            'WakebyDistribution',
+            'WalleniusHypergeometricDistribution',
+            'WaringYuleDistribution',
+            'WarpingCorrespondence',
+            'WarpingDistance',
+            'WatershedComponents',
+            'WatsonUSquareTest',
+            'WattsStrogatzGraphDistribution',
+            'WaveletBestBasis',
+            'WaveletFilterCoefficients',
+            'WaveletImagePlot',
+            'WaveletListPlot',
+            'WaveletMapIndexed',
+            'WaveletMatrixPlot',
+            'WaveletPhi',
+            'WaveletPsi',
+            'WaveletScale',
+            'WaveletScalogram',
+            'WaveletThreshold',
+            'WeakStationarity',
+            'WeaklyConnectedComponents',
+            'WeaklyConnectedGraphComponents',
+            'WeaklyConnectedGraphQ',
+            'WeatherData',
+            'WeatherForecastData',
+            'WeberE',
+            'Wedge',
+            'Wednesday',
+            'WeibullDistribution',
+            'WeierstrassHalfPeriods',
+            'WeierstrassInvariants',
+            'WeierstrassP',
+            'WeierstrassPPrime',
+            'WeierstrassSigma',
+            'WeierstrassZeta',
+            'WeightedAdjacencyGraph',
+            'WeightedAdjacencyMatrix',
+            'WeightedData',
+            'WeightedGraphQ',
+            'Weights',
+            'WelchWindow',
+            'WheelGraph',
+            'WhenEvent',
+            'Which',
+            'While',
+            'White',
+            'WhiteNoiseProcess',
+            'WhitePoint',
+            'Whitespace',
+            'WhitespaceCharacter',
+            'WhittakerM',
+            'WhittakerW',
+            'WienerFilter',
+            'WienerProcess',
+            'WignerD',
+            'WignerSemicircleDistribution',
+            'WikipediaData',
+            'WikipediaSearch',
+            'WilksW',
+            'WilksWTest',
+            'WindDirectionData',
+            'WindSpeedData',
+            'WindVectorData',
+            'WindowClickSelect',
+            'WindowElements',
+            'WindowFloating',
+            'WindowFrame',
+            'WindowMargins',
+            'WindowMovable',
+            'WindowOpacity',
+            'WindowSize',
+            'WindowStatusArea',
+            'WindowTitle',
+            'WindowToolbars',
+            'WishartMatrixDistribution',
+            'With',
+            'WolframAlpha',
+            'WolframLanguageData',
+            'Word',
+            'WordBoundary',
+            'WordCharacter',
+            'WordCloud',
+            'WordCount',
+            'WordCounts',
+            'WordData',
+            'WordDefinition',
+            'WordFrequency',
+            'WordFrequencyData',
+            'WordList',
+            'WordOrientation',
+            'WordSearch',
+            'WordSeparators',
+            'WordSpacings',
+            'WordStem',
+            'WordTranslation',
+            'WorkingPrecision',
+            'WrapAround',
+            'Write',
+            'WriteLine',
+            'WriteString',
+            'Wronskian',
+
+            'XMLElement',
+            'XMLObject',
+            'XMLTemplate',
+            'XYZColor',
+            'Xnor',
+            'Xor',
+
+            'Yellow',
+            'Yesterday',
+            'YuleDissimilarity',
+
+            'ZIPCodeData',
+            'ZTest',
+            'ZTransform',
+            'ZernikeR',
+            'ZeroSymmetric',
+            'ZeroTest',
+            'Zeta',
+            'ZoomCenter',
+            'ZetaZero',
+            'ZipfDistribution',
+            'ZoomFactor'
+        )
+    ),
+    'CASE_SENSITIVE' => array(
+        1 => true
+    ),
+    'SYMBOLS' => array(
+        1 => array(
+            '@', '//', '/@', '@@', '@@@', '#', '&', //functions
+            '=', ':=', '+=', '-=', '*=', '/=', //assignments
+            '^', '+' ,'-', '/', '*', '>', '<', '%', //math
+            '||', '&&', //logic
+            '/.', '/;', '->', ':>' //rules
+        ),
+        2 => array( // Wolfram
+            '$Aborted',
+            '$AllowExternalChannelFunctions',
+            '$AssertFunction',
+            '$Assumptions',
+            '$AsynchronousTask',
+            '$AudioOutputDevices',
+
+            '$BaseDirectory',
+            '$BatchInput',
+            '$BatchOutput',
+            '$ByteOrdering',
+
+            '$CacheBaseDirectory',
+            '$Canceled',
+            '$ChannelBase',
+            '$CharacterEncoding',
+            '$CharacterEncodings',
+            '$CloudBase',
+            '$CloudConnected',
+            '$CloudCreditsAvailable',
+            '$CloudEvaluation',
+            '$CloudExpressionBase',
+            '$CloudRootDirectory',
+            '$CloudSymbolBase',
+            '$CommandLine',
+            '$CompilationTarget',
+            '$ConfiguredKernels',
+            '$Context',
+            '$ContextPath',
+            '$ControlActiveSetting',
+            '$CookieStore',
+            '$Cookies',
+            '$CreationDate',
+            '$CurrentLink',
+
+            '$DateStringFormat',
+            '$DefaultAudioOutputDevice',
+            '$DefaultImagingDevice',
+            '$DefaultLocalBase',
+            '$Display',
+            '$DisplayFunction',
+            '$DistributedContexts',
+            '$DynamicEvaluation',
+
+            '$Echo',
+            '$EmbedCodeEnvironments',
+            '$EmbeddableServices',
+            '$EntityStores',
+            '$Epilog',
+            '$EvaluationCloudObject',
+            '$EvaluationEnvironment',
+            '$ExportFormats',
+
+            '$Failed',
+            '$FontFamilies',
+            '$FrontEnd',
+            '$FrontEndSession',
+
+            '$GeoLocation',
+            '$GeoLocationCity',
+            '$GeoLocationCountry',
+            '$GeoLocationSource',
+
+            '$HistoryLength',
+            '$HomeDirectory',
+
+            '$IgnoreEOF',
+            '$ImageFormattingWidth',
+            '$ImagingDevice',
+            '$ImagingDevices',
+            '$ImportFormats',
+            '$InitialDirectory',
+            '$Input',
+            '$InputFileName',
+            '$InputStreamMethods',
+            '$Inspector',
+            '$InstallationDirectory',
+            '$InterpreterTypes',
+            '$IterationLimit',
+
+            '$KernelCount',
+            '$KernelID',
+
+            '$Language',
+            '$LibraryPath',
+            '$LicenseExpirationDate',
+            '$LicenseID',
+            '$LicenseServer',
+            '$Line',
+            '$Linked',
+            '$LocalBase',
+            '$LocalSymbolBase',
+
+            '$MachineAddresses',
+            '$MachineDomains',
+            '$MachineEpsilon',
+            '$MachineID',
+            '$MachineName',
+            '$MachinePrecision',
+            '$MachineType',
+            '$MaxExtraPrecision',
+            '$MaxMachineNumber',
+            '$MaxNumber',
+            '$MaxPiecewiseCases',
+            '$MaxPrecision',
+            '$MaxRootDegree',
+            '$MessageGroups',
+            '$MessageList',
+            '$MessagePrePrint',
+            '$Messages',
+            '$MinMachineNumber',
+            '$MinNumber',
+            '$MinPrecision',
+            '$ModuleNumber',
+
+            '$NewMessage',
+            '$NewSymbol',
+            '$Notebooks',
+            '$NumberMarks',
+
+            '$OperatingSystem',
+            '$Output',
+            '$OutputSizeLimit',
+            '$OutputStreamMethods',
+
+            '$Packages',
+            '$ParentLink',
+            '$ParentProcessID',
+            '$Path',
+            '$PathnameSeparator',
+            '$PerformanceGoal',
+            '$Permissions',
+            '$PlotTheme',
+            '$Post',
+            '$Pre',
+            '$PrePrint',
+            '$PreRead',
+            '$Printout3DPreviewer',
+            '$ProcessID',
+            '$ProcessorCount',
+            '$ProcessorType',
+
+            '$RecursionLimit',
+            '$ReleaseNumber',
+            '$RequesterAddress',
+            '$RequesterWolframID',
+            '$RequesterWolframUUID',
+            '$RootDirectory',
+
+            '$ScheduledTask',
+            '$ScriptCommandLine',
+            '$ScriptInputString',
+            '$Services',
+            '$SessionID',
+            '$SharedFunctions',
+            '$SharedVariables',
+            '$SoundDisplayFunction',
+            '$SourceLink',
+            '$SynchronousEvaluation',
+            '$SyntaxHandler',
+            '$System',
+            '$SystemCharacterEncoding',
+            '$SystemID',
+            '$SystemShell',
+            '$SystemTimeZone',
+            '$SystemWordLength',
+
+            '$TemplatePath',
+            '$TemporaryDirectory',
+            '$TimeUnit',
+            '$TimeZone',
+            '$TimeZoneEntity',
+            '$TimedOut',
+
+            '$UnitSystem',
+            '$Urgent',
+            '$UserAgentString',
+            '$UserBaseDirectory',
+            '$UserDocumentsDirectory',
+            '$UserName',
+
+            '$Version',
+            '$VersionNumber',
+
+            '$WolframID',
+            '$WolframUUID',
+        ),
+        3 => array( // array stuff
+            '{', '}', '[[', ']]', '<|', '|>'
+        ),
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #FF7700; font-weight: bold;',
+        ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #999999; font-style: italic;',
+        ),
+        'ESCAPE_CHAR' => array(
+            1 => '',
+        ),
+        'BRACKETS' => array(),
+        'STRINGS' => array(
+            1 => 'color: #666666; font-style: italic;',
+        ),
+        'NUMBERS' => array(
+        ),
+        'METHODS' => array(),
+        'SYMBOLS' => array(
+            1 => 'color: #133CAC; font-weight: bold;',
+            2 => 'color: #028E9B; font-weight: bold;',
+            3 => 'color: #FFAD00; font-weight: bold;',
+        ),
+        //'BRACKETS' => array(
+        //0 => 'color: #8C0953; font-weight: bold;', // array
+        //),
+        'REGEXPS' => array(
+            0 => 'color: #133CAC; font-weight: bold;',
+        ),
+        'SCRIPT' => array()
+    ),
+    'URLS' => array(
+        1 => 'http://reference.wolfram.com/language/ref/{FNAME}.html'
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => '#[1-9][0-9]*'
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4
+);
diff --git a/htdocs/application/libraries/geshi/geshi/matlab.php b/htdocs/application/libraries/geshi/geshi/matlab.php
index ee275f0..f6e8ee5 100644
--- a/htdocs/application/libraries/geshi/geshi/matlab.php
+++ b/htdocs/application/libraries/geshi/geshi/matlab.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Florian Knorn (floz@gmx.de)
  * Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/02/09
  *
  * Matlab M-file language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/mercury.php b/htdocs/application/libraries/geshi/geshi/mercury.php
new file mode 100644
index 0000000..9f77e4b
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/mercury.php
@@ -0,0 +1,130 @@
+<?php
+/*************************************************************************************
+ * mercury.php
+ * --------
+ * Author: Sebastian Godelet (sebastian.godelet+github@gmail.com)
+ * Copyright: (c) 2014
+ * Release Version: 1.0.9.0
+ * Date Started: 2014/10/30
+ *
+ * Mercury language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2014/10/30 (1.0.8.13)
+ *  -  First Release
+ *
+ * TODO (updated 2014/10/30)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Mercury',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array('"', "\'"),
+    'HARDCHAR' => '"',
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'end_module', 'finalise', 'finalize', 'func', 'implementation',
+            'include_module', 'initalisation', 'initialization',
+            'instance', 'interface',
+            'import_module', 'module', 'pragma', 'pred',
+            'type', 'typeclass', 'use_module'
+        ),
+        2 => array(
+            'atomic', 'foreign_code', 'foreign_export', 'foreign_type', 'memo'
+        )
+    ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']', '{', '}',),
+        1 => array('?-', ':-', '=:='),
+        2 => array('\-', '\+', '\*', '\/', '/\\'),
+        3 => array('-', '+', '*', '/'),
+        4 => array('.', ':', ',', ';'),
+        5 => array('!', '@', '&', '|', '!.', '!:'),
+        6 => array('<', '>', '=')
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990000;',
+            2 => 'color: #99aa77;'
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #800080;'
+        ),
+        'METHODS' => array(),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #339933;',
+            2 => 'color: #339933;',
+            3 => 'color: #339933;',
+            4 => 'color: #339933;',
+            5 => 'color: #339933;',
+            6 => 'color: #339933;'
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #008080;'
+        ),
+        'SCRIPT' => array()
+    ),
+    'URLS' => array(
+        1 => 'http://www.mercurylang.org',
+        2 => 'http://www.mercurylang.org'
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        //Variables
+        0 => "(?<![a-zA-Z0-9_])(?!(?:PIPE|SEMI|DOT)[^a-zA-Z0-9_])[A-Z_][a-zA-Z0-9_]*(?![a-zA-Z0-9_])(?!\x7C)"
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4
+);
diff --git a/htdocs/application/libraries/geshi/geshi/metapost.php b/htdocs/application/libraries/geshi/geshi/metapost.php
new file mode 100644
index 0000000..f5944cb
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/metapost.php
@@ -0,0 +1,399 @@
+<?php
+/*************************************************************************************
+ * metapost.php
+ * -----------
+ * Author: Maxime Chupin (notezik@gmail.com)
+ * Copyright: (c) 2011 Maxime Chupin
+ * Release Version: 1.0.9.0
+ * Date Started: 2011/08/02
+ *
+ * Metapost language file for GeSHi.
+ *
+ * https://en.wikipedia.org/wiki/MetaPost
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MetaPost',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array(
+        'verbatim'=>'etex', //TeX and LaTeX preambule
+        'btex' => 'etex' //TeX invocation
+    ),
+    'COMMENT_REGEXP' => array(
+    ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array( //type
+            'boolean',
+            'color', 'cmykcolor',
+            'expr',
+            'numeric',
+            'pair', 'path', 'pen', 'picture',
+            'string', 'suffix',
+            'text', 'transform',
+        ),
+        2 => array( //file construction
+            'beginfig', 'begingroup',
+            'def',
+            'end', 'enddef', 'endfig', 'endgroup',
+            'hide',
+            'image', 'input',
+            'let',
+            'makepen', 'makepath',
+            'newinternal',
+            'primary', 'primarydef',
+            'save', 'secondarydef', 'shipout', 'special',
+            'tertiarydef',
+            'vardef'
+        ),
+        3 => array( //programmation structure
+            'else', 'elseif', 'endfor', 'exitif', 'exitunless',
+            'fi', 'for', 'forever', 'forsuffix',
+            'if',
+            'step',
+            'until', 'upto',
+        ),
+        4 => array( //operations return pair
+            'bot',
+            'dir', 'direction of',
+            'intersectionpoint', 'intiersectiontimes',
+            'lft', 'llcorner', 'lrcorner',
+            'penoffset of', 'point of', 'postcontrol of', 'precontrol of',
+            'rt',
+            'top',
+            'ulcorner', 'unitvector', 'urcorner',
+            'z',
+        ),
+        5 => array( //operations return path or picture or pen
+            'bbox',
+            'center', 'cutafter', 'cutbefore',
+            'dashpart', 'dashpattern',
+            'glyph of',
+            'infont',
+            'pathpart', 'penpart',
+            'reverse',
+            'subpath of',
+        ),
+        6 => array( //operations return string (or complementary)
+            'closefrom',
+            'fontpart',
+            'readfrom',
+            'str', 'substring of',
+            'textpart'
+        ),
+        7 => array( // operations return numeric
+            'abs', 'angle', 'arclength', 'arctime of', 'ASCII',
+            'blackpart', 'bluepart',
+            'ceiling', 'char', 'colormodel', 'cosd', 'cyanpart',
+            'decimal', 'decr', 'directionpoint of', 'directiontime of',
+            'div', 'dotprod',
+            'floor', 'fontsize',
+            'greenpart', 'greypart',
+            'hex',
+            'incr',
+            'length',
+            'magentapart', 'max', 'mexp', 'min', 'mlog', 'mod',
+            'normaldeviate',
+            'oct',
+            'redpart', 'round',
+            'sind', 'sqrt',
+            'uniformdeviate',
+            'xpart', 'xxpart', 'xypart',
+            'yellowpart', 'ypart', 'yxpart', 'yypart',
+        ),
+        8 => array( // operations return boolean
+            'and',
+            'bounded',
+            'clipped',
+            'filled',
+            'known',
+            'not',
+            'odd',
+            'or',
+            'rgbcolor',
+            'stroked',
+            'textual',
+            'unknown'
+        ),
+        9 => array( //operations return color
+            'colorpart'
+        ),
+        10 => array( //operations return transform
+            'inverse'
+        ),
+        11 => array( //constructors
+            'also',
+            'buildcycle',
+            'contour', 'controls', 'cycle',
+            'doublepath',
+            'setbounds',
+            'to',
+            'whatever'
+        ),
+        12 => array( //labels
+            'label',
+            'label.bot',
+            'label.top',
+            'label.llft',
+            'label.lft',
+            'label.ulft',
+            'label.lrt',
+            'label.rt',
+            'label.urt',
+
+            'labels',
+            'labels.bot',
+            'labels.top',
+            'labels.llft',
+            'labels.lft',
+            'labels.ulft',
+            'labels.lrt',
+            'labels.rt',
+            'labels.urt',
+
+            'thelabel',
+            'thelabel.bot',
+            'thelabel.top',
+            'thelabel.llft',
+            'thelabel.lft',
+            'thelabel.ulft',
+            'thelabel.lrt',
+            'thelabel.rt',
+            'thelabel.urt',
+
+            'dotlabel',
+            'dotlabel.bot',
+            'dotlabel.top',
+            'dotlabel.llft',
+            'dotlabel.lft',
+            'dotlabel.ulft',
+            'dotlabel.lrt',
+            'dotlabel.rt',
+            'dotlabel.urt',
+        ),
+        13 => array( //general transformations
+            'about',
+            'reflected', 'reflectedaround',
+            'rotated', 'rotatedabout', 'rotatedaround',
+            'scaled', 'slanted', 'shifted',
+            'transformed',
+            'xscaled',
+            'yscaled',
+            'zscaled',
+        ),
+        14 => array( //draw instructions
+            'addto',
+            'clip', 'cutdraw',
+            'draw', 'drawarrow', 'drawdblarrow', 'drawdot',
+            'fill', 'filldraw',
+            'undraw', 'unfill', 'unfilldraw'
+        ),
+        15 => array( //style of drawing
+            'curl',
+            'dashed', 'drawoptions',
+            'pickup',
+            'tension',
+            'withcmykcolor', 'withcolor',
+            'withgreyscale', 'withpen', 'withpostscript', 'withprescript',
+            'withrgbcolor',
+        ),
+        16 => array( //read write show
+            'errhelp', 'errmessage',
+            'fontmapfile', 'fontmapline',
+            'interim',
+            'loggingall',
+            'message',
+            'scantokens', 'show', 'showdependencies', 'showtoken', 'showvariable',
+            'tracingall', 'tracingnone',
+            'write to',
+        ),
+        17 => array( //Internal variables with numeric values
+            'ahangle', 'ahlength',
+            'bboxmargin',
+            'charcode',
+            'day', 'defaultcolormodel', 'defaultpen', 'defaultscale',
+            'dotlabeldiam',
+            'hour',
+            'labeloffset',
+            'linecap', 'linejoin',
+            'minute', 'miterlimit', 'month', 'mpprocset',
+            'pausing', 'prologues',
+            'restoreclipcolor',
+            'showstopping',
+            'time',
+            'tracingcapsules', 'tracingchoices', 'tracingcommands',
+            'tracingequations', 'tracinglostchars', 'tracingmacros',
+            'tracingonline', 'tracingoutput', 'tracingrestores',
+            'tracingspecs', 'tracingstats', 'tracingtitles',
+            'troffmode', 'truecorners',
+            'warningcheck',
+            'year',
+        ),
+        18 => array( //Internal string variables
+            'filenametemplate',
+            'jobname',
+            'outputformat', 'outputtemplate',
+        ),
+        19 => array( //other predefined variables
+            'background',
+            'currentpen', 'currentpicture', 'cuttings',
+            'defaultfont',
+            'extra_beginfig', 'extra_endfig',
+        ),
+        20 => array( //predefined constants
+            'beveled', 'black', 'blue', 'bp', 'butt',
+            'cc', 'cm',
+            'dd', 'ditto', 'down',
+            'epsilon', 'evenly', 'EOF',
+            'false', 'fullcircle',
+            'green',
+            'halfcircle',
+            'identity',
+            'left',
+            'mitered', 'mm', 'mpversion',
+            'nullpen', 'nullpicture',
+            'origin',
+            'pc', 'pencircle', 'pensquare', 'pt',
+            'quartercircle',
+            'red', 'right', 'rounded',
+            'squared',
+            'true',
+            'unitsquare', 'up',
+            'white', 'withdots',
+        )
+    ),
+    'SYMBOLS' => array(
+        '&', ':=', '=', '+', '-',
+        '*', '**', '/', '++', '+-+',
+        '<', '>', '>=', '<=', '<>',
+        '#@', '@', '@#'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        11 => true,
+        12 => true,
+        13 => true,
+        14 => true,
+        15 => true,
+        16 => true,
+        17 => true,
+        18 => true,
+        19 => true,
+        20 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1  => 'color: #472;', //type
+            2  => 'color: #35A;font-weight: bold;', //file construction
+            3  => 'color: #A53;', //structure
+            4  => 'color: #35A;', //operations return pair
+            5  => 'color: #35A;', //operations return path or picture or pen
+            6  => 'color: #35A;', //operations return string
+            7  => 'color: #35A;', //operations return numeric
+            8  => 'color: #35A;', //operations return boolean
+            9  => 'color: #35A;', //operations return color
+            10 => 'color: #35A;', //operations return transform
+            11 => 'color: #35A;', //constructors
+            12 => 'color: #35A;', //labels
+            13 => 'color: #3B5;', //general transformations
+            14 => 'color: #35A;', //draw instructions
+            15 => 'color: #472;', //style of drawing
+            16 => 'color: #000;', //read write show
+            17 => 'color: #000;', //Internal variables with numeric values
+            18 => 'color: #000;', //Internal string variables
+            19 => 'color: #000;', //other predefined variables
+            20 => 'color: #000;'  //predefined constants
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #777;',
+            'MULTI' => 'color: #880;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #820;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #880;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #000;'
+        ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #000;'
+        ),
+        'REGEXPS' => array(
+        ),
+        'SCRIPT' => array(
+            0 => ''
+        )
+    ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => '',
+        18 => '',
+        19 => '',
+        20 => ''
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+    ),
+    'REGEXPS' => array(
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+    )
+);
diff --git a/htdocs/application/libraries/geshi/geshi/mirc.php b/htdocs/application/libraries/geshi/geshi/mirc.php
index 4b62bc4..4aea845 100644
--- a/htdocs/application/libraries/geshi/geshi/mirc.php
+++ b/htdocs/application/libraries/geshi/geshi/mirc.php
@@ -4,7 +4,7 @@
  * -----
  * Author: Alberto 'Birckin' de Areba (Birckin@hotmail.com)
  * Copyright: (c) 2006 Alberto de Areba
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/05/29
  *
  * mIRC Scripting language file for GeSHi.
@@ -125,7 +125,7 @@ $language_data = array (
     'URLS' => array(
         1 => '',
         2 => '',
-        3 => 'http://www.mirc.com/{FNAMEL}'
+        3 => 'http://en.wikichip.org/wiki/mirc/commands/{FNAMEL}'
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array('.'),
diff --git a/htdocs/application/libraries/geshi/geshi/mk-61.php b/htdocs/application/libraries/geshi/geshi/mk-61.php
new file mode 100644
index 0000000..653a336
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/mk-61.php
@@ -0,0 +1,106 @@
+<?php
+/*********************************************************************
+ * МК-61/52 language file for GeSHi.
+ *
+ * Author: Russkiy
+ * Copyright: (c) 2014 Russkiy
+ * Release Version: 1.0.9.0
+ * Date Started: 2014-03-11
+ *
+ *********************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ********************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'МК-61/52',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(),
+    'SYMBOLS' => array(),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(),
+        'COMMENTS' => array(),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(),
+        'STRINGS' => array(),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'SYMBOLS' => array(),
+        'SCRIPT' => array(),
+        'REGEXPS' => array(
+            1 => 'color:#000000;',
+            2 => 'color:#A0A000;',
+            3 => 'color:#00A000;',
+            4 => 'color:#A00000;',
+            5 => 'color:#0000A0;',
+            6 => 'text-decoration: underline; color: #A000A0;',
+            7 => 'font-size: 75%; color: #A0A0A0;'
+        )
+    ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        1 => array(
+            GESHI_SEARCH => '(\s|\t|^|\G|\.)((F|K|К)?(пи|π|СЧ|KСЧ|КСЧ|,|\.|\/\-\/|\+\/\-|ВП))(\s|\t|$)',
+            GESHI_REPLACE => '\\4',
+            GESHI_MODIFIERS => '', GESHI_BEFORE => '\\1<span style="font-weight:lighter;font-size:90%;color:#404040;">\\3</span>', GESHI_AFTER => '\\5'
+        ),
+        2 => array(
+            GESHI_SEARCH => '(\s|\t|^|\G|\.)((F|K|К)?(НОП|&lt;\-&gt;|XY|↔|X↔Y|\^|В\^|↑|В↑|Вx|Вx|Сx|\-&gt;|↻|→))(\s|\t|$)',
+            GESHI_REPLACE => '\\4',
+            GESHI_MODIFIERS => '', GESHI_BEFORE => '\\1<span style="font-weight:lighter;font-size:90%;color:#404040;">\\3</span>', GESHI_AFTER => '\\5'
+        ),
+        3 => array(
+            GESHI_SEARCH => '(\s|\t|^|\G|\.)((K|К)?(П|XП|ИП|ПX|Пx)(\d|[A-E]|[a-e]|(А|В|С|Д|Е)))(\s|\t|$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '', GESHI_BEFORE => '\\1', GESHI_AFTER => '\\7'
+        ),
+        4 => array(
+            GESHI_SEARCH => '(\s|\t|^|\G|\.)((F|K|К)?(10\^x|10x|e\^x|ex|lg|ln|ЧМ|arcsin|<PIPE>x<PIPE>|arccos|ЗН|arctg|ГМ|sin|\[x\]|cos|\{x\}|\(x\)|tg|max|\+|\-|\*|x|х|×|⋅|\/|\:|÷|МГ|КвКор|квкор|корень|√|x\^2|x2|x²|1\/x|x\^y|xy|МЧ|\x2F\x5C|⋀|\x5C\x2F|⋁|\(\+\)|⊕|ИНВ))(\s|\t|$)',
+            GESHI_REPLACE => '\\4',
+            GESHI_MODIFIERS => '', GESHI_BEFORE => '\\1<span style="font-weight:lighter;font-size:90%;color:#404040;">\\3</span>', GESHI_AFTER => '\\5'
+        ),
+        5 => array(
+            GESHI_SEARCH => '(\s|\t|^|\G|\.)((F?)((K|К)?(В\/О|В\/0|С\/П|x&gt;\=0|x≥0|x≥0|x⩾0|x\#0|x\!\=0|x&lt;&gt;0|x≠0|БП|ПП|L2|L3|x&lt;0|x\=0|L0|L1)))(\s|\t|$)',
+            GESHI_REPLACE => '\\4',
+            GESHI_MODIFIERS => '', GESHI_BEFORE => '\\1<span style="font-weight:lighter;font-size:90%;color:#404040;">\\3</span>', GESHI_AFTER => '\\7'
+        ),
+        6 => array(
+            GESHI_SEARCH => '(\s|\t|^|\G|\.)(\d{2})(\s|\t|$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '', GESHI_BEFORE => '\\1', GESHI_AFTER => '\\3'
+        ),
+        7 => array(
+            GESHI_SEARCH => '(\s|\t|^|\G|\.)([\d\-A]\d\.)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '', GESHI_BEFORE => '\\1', GESHI_AFTER => ''
+        )
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array()
+);
diff --git a/htdocs/application/libraries/geshi/geshi/mmix.php b/htdocs/application/libraries/geshi/geshi/mmix.php
index b4dacdb..5c8178c 100644
--- a/htdocs/application/libraries/geshi/geshi/mmix.php
+++ b/htdocs/application/libraries/geshi/geshi/mmix.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2009 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/10/16
  *
  * MMIX Assembler language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/modula2.php b/htdocs/application/libraries/geshi/geshi/modula2.php
index 522f46c..2a20973 100644
--- a/htdocs/application/libraries/geshi/geshi/modula2.php
+++ b/htdocs/application/libraries/geshi/geshi/modula2.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Benjamin Kowarsch (benjamin@modula2.net)
  * Copyright: (c) 2009 Benjamin Kowarsch (benjamin@modula2.net)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/11/05
  *
  * Modula-2 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/modula3.php b/htdocs/application/libraries/geshi/geshi/modula3.php
index 3b40a68..b3c223c 100644
--- a/htdocs/application/libraries/geshi/geshi/modula3.php
+++ b/htdocs/application/libraries/geshi/geshi/modula3.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: mbishop (mbishop@esoteriq.org)
  * Copyright: (c) 2009 mbishop (mbishop@esoteriq.org)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/01/21
  *
  * Modula-3 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/mpasm.php b/htdocs/application/libraries/geshi/geshi/mpasm.php
index 3bdc1a0..e6cf70e 100644
--- a/htdocs/application/libraries/geshi/geshi/mpasm.php
+++ b/htdocs/application/libraries/geshi/geshi/mpasm.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: Bakalex (bakalex@gmail.com)
  * Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/12/6
  *
  * Microchip Assembler language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/mxml.php b/htdocs/application/libraries/geshi/geshi/mxml.php
index 53945f9..4bac672 100644
--- a/htdocs/application/libraries/geshi/geshi/mxml.php
+++ b/htdocs/application/libraries/geshi/geshi/mxml.php
@@ -4,7 +4,7 @@
  * -------
  * Author: David Spurr
  * Copyright: (c) 2007 David Spurr (http://www.defusion.org.uk/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/10/04
  *
  * MXML language file for GeSHi. Based on the XML file by Nigel McNie
diff --git a/htdocs/application/libraries/geshi/geshi/mysql.php b/htdocs/application/libraries/geshi/geshi/mysql.php
index ff36cde..e62a122 100644
--- a/htdocs/application/libraries/geshi/geshi/mysql.php
+++ b/htdocs/application/libraries/geshi/geshi/mysql.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: Marjolein Katsma (marjolein.is.back@gmail.com)
  * Copyright: (c) 2008 Marjolein Katsma (http://blog.marjoleinkatsma.com/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008-12-12
  *
  * MySQL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/nagios.php b/htdocs/application/libraries/geshi/geshi/nagios.php
index 6dec5df..ac6d63a 100644
--- a/htdocs/application/libraries/geshi/geshi/nagios.php
+++ b/htdocs/application/libraries/geshi/geshi/nagios.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Albéric de Pertat <alberic@depertat.net>
  * Copyright: (c) 2012 Albéric de Pertat (https://github.com/adepertat/geshi-nagios)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/01/19
  *
  * Nagios language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/netrexx.php b/htdocs/application/libraries/geshi/geshi/netrexx.php
index 0ef4be0..38e09fa 100644
--- a/htdocs/application/libraries/geshi/geshi/netrexx.php
+++ b/htdocs/application/libraries/geshi/geshi/netrexx.php
@@ -6,7 +6,7 @@
  * Contributors:
  *    - Walter Pachl (pachl@chello.at)
  * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/01/07
  *
  * NetRexx language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/newlisp.php b/htdocs/application/libraries/geshi/geshi/newlisp.php
index 134ccfc..b5a9431 100644
--- a/htdocs/application/libraries/geshi/geshi/newlisp.php
+++ b/htdocs/application/libraries/geshi/geshi/newlisp.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: cormullion (cormullion@mac.com) Sept 2009
  * Copyright: (c) 2009 Cormullion (http://unbalanced-parentheses.nfshost.com/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/09/30
  *
  * newLISP language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/nginx.php b/htdocs/application/libraries/geshi/geshi/nginx.php
index 0d4fe3b..47ced0a 100644
--- a/htdocs/application/libraries/geshi/geshi/nginx.php
+++ b/htdocs/application/libraries/geshi/geshi/nginx.php
@@ -7,7 +7,7 @@
  * Contributors:
  *  - Deoren Moor (http://www.whyaskwhy.org/blog/)
  *  - Thomas Joiner
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/08/24
  *
  * nginx language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/nimrod.php b/htdocs/application/libraries/geshi/geshi/nimrod.php
index b288ae0..a85edfb 100644
--- a/htdocs/application/libraries/geshi/geshi/nimrod.php
+++ b/htdocs/application/libraries/geshi/geshi/nimrod.php
@@ -4,14 +4,14 @@
  * ----------
  * Author: Dennis Felsing (dennis@felsin9.de)
  * Copyright: (c) 2014 Dennis Felsing
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2014/07/15
  *
  * Nimrod language file for GeSHi.
  *
  * CHANGES
  * -------
- * 2014/07/15 (1.0.8.12)
+ * 2014/07/15 (1.0.8.13)
  *  -  First Release
  *
  * TODO (updated 2014/07/15)
diff --git a/htdocs/application/libraries/geshi/geshi/nsis.php b/htdocs/application/libraries/geshi/geshi/nsis.php
index 02b1eb2..61da046 100644
--- a/htdocs/application/libraries/geshi/geshi/nsis.php
+++ b/htdocs/application/libraries/geshi/geshi/nsis.php
@@ -4,7 +4,7 @@
  * --------
  * Author: deguix (cevo_deguix@yahoo.com.br), Tux (http://tux.a4.cz/), Jan T. Sott (http://github.com/idleberg)
  * Copyright: (c) 2005 deguix, 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/12/03
  *
  * Nullsoft Scriptable Install System language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/oberon2.php b/htdocs/application/libraries/geshi/geshi/oberon2.php
index 30869ff..8540cad 100644
--- a/htdocs/application/libraries/geshi/geshi/oberon2.php
+++ b/htdocs/application/libraries/geshi/geshi/oberon2.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: mbishop (mbishop@esoteriq.org)
  * Copyright: (c) 2009 mbishop (mbishop@esoteriq.org)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/02/10
  *
  * Oberon-2 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/objc.php b/htdocs/application/libraries/geshi/geshi/objc.php
index 4da05b6..3fdf49a 100644
--- a/htdocs/application/libraries/geshi/geshi/objc.php
+++ b/htdocs/application/libraries/geshi/geshi/objc.php
@@ -5,7 +5,7 @@
  * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
  * Contributors: Quinn Taylor (quinntaylor@mac.com)
  * Copyright: (c) 2008 Quinn Taylor, 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * Objective-C language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/objeck.php b/htdocs/application/libraries/geshi/geshi/objeck.php
index 34dd091..6fab2d0 100644
--- a/htdocs/application/libraries/geshi/geshi/objeck.php
+++ b/htdocs/application/libraries/geshi/geshi/objeck.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Randy Hollines (objeck@gmail.com)
  * Copyright: (c) 2010 Randy Hollines (http://code.google.com/p/objeck-lang/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/07/01
  *
  * Objeck Programming Language language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ocaml-brief.php b/htdocs/application/libraries/geshi/geshi/ocaml-brief.php
index 84c74bf..f63c9e7 100644
--- a/htdocs/application/libraries/geshi/geshi/ocaml-brief.php
+++ b/htdocs/application/libraries/geshi/geshi/ocaml-brief.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Flaie (fireflaie@gmail.com)
  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/08/27
  *
  * OCaml (Objective Caml) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ocaml.php b/htdocs/application/libraries/geshi/geshi/ocaml.php
index 364f556..4e14082 100644
--- a/htdocs/application/libraries/geshi/geshi/ocaml.php
+++ b/htdocs/application/libraries/geshi/geshi/ocaml.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Flaie (fireflaie@gmail.com)
  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/08/27
  *
  * OCaml (Objective Caml) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/octave.php b/htdocs/application/libraries/geshi/geshi/octave.php
index 4f6677f..a77e5da 100644
--- a/htdocs/application/libraries/geshi/geshi/octave.php
+++ b/htdocs/application/libraries/geshi/geshi/octave.php
@@ -6,7 +6,7 @@
  *         Juan Pablo Carbajal (carbajal@ifi.uzh.ch)
  * Copyright: (c) 2012 Carnë Draug
  *            (c) 2012 Juan Pablo Carbajal
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/05/22
  *
  * GNU/Octave M-file language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/oobas.php b/htdocs/application/libraries/geshi/geshi/oobas.php
index 4a314df..e6f5efd 100644
--- a/htdocs/application/libraries/geshi/geshi/oobas.php
+++ b/htdocs/application/libraries/geshi/geshi/oobas.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/30
  *
  * OpenOffice.org Basic language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/oorexx.php b/htdocs/application/libraries/geshi/geshi/oorexx.php
index 7eda35e..5fde800 100644
--- a/htdocs/application/libraries/geshi/geshi/oorexx.php
+++ b/htdocs/application/libraries/geshi/geshi/oorexx.php
@@ -6,7 +6,7 @@
  * Contributors:
  *    - Walter Pachl (pachl@chello.at)
  * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/01/07
  *
  * ooRexx language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/oracle11.php b/htdocs/application/libraries/geshi/geshi/oracle11.php
index 8681236..36b2082 100644
--- a/htdocs/application/libraries/geshi/geshi/oracle11.php
+++ b/htdocs/application/libraries/geshi/geshi/oracle11.php
@@ -6,7 +6,7 @@
  * Contributions:
  * - Updated for 11i by Simon Redhead
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * Oracle 11i language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/oracle8.php b/htdocs/application/libraries/geshi/geshi/oracle8.php
index acf6d99..f132090 100644
--- a/htdocs/application/libraries/geshi/geshi/oracle8.php
+++ b/htdocs/application/libraries/geshi/geshi/oracle8.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * Oracle 8 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/oxygene.php b/htdocs/application/libraries/geshi/geshi/oxygene.php
index 2ee1998..662bba2 100644
--- a/htdocs/application/libraries/geshi/geshi/oxygene.php
+++ b/htdocs/application/libraries/geshi/geshi/oxygene.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Carlo Kok (ck@remobjects.com), J�rja Norbert (jnorbi@vipmail.hu), Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2004 J�rja Norbert, Benny Baumann (BenBE@omorphia.de), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/01/11
  *
  * Delphi Prism (Oxygene) language file for GeSHi.
@@ -12,7 +12,7 @@
  *
  * CHANGES
  * -------
- * 2014/01/09 (1.0.8.12)
+ * 2014/01/09 (1.0.8.13)
  *   -  New keywords & updated languge name
  * 2012/06/28 (1.0.8.11)
  *   -  Added "write" keyword for properties
diff --git a/htdocs/application/libraries/geshi/geshi/oz.php b/htdocs/application/libraries/geshi/geshi/oz.php
index e31852d..3b96566 100644
--- a/htdocs/application/libraries/geshi/geshi/oz.php
+++ b/htdocs/application/libraries/geshi/geshi/oz.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Wolfgang Meyer (Wolfgang.Meyer@gmx.net)
  * Copyright: (c) 2010 Wolfgang Meyer
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/01/03
  *
  * Oz language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/parasail.php b/htdocs/application/libraries/geshi/geshi/parasail.php
index 98e2ab8..a72d845 100644
--- a/htdocs/application/libraries/geshi/geshi/parasail.php
+++ b/htdocs/application/libraries/geshi/geshi/parasail.php
@@ -4,7 +4,7 @@
  * -------
  * Author: T. Taft (taft@adacore.com)
  * Copyright: (c) 2012 AdaCore (http://adacore.com/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/08/02
  *
  * ParaSail language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/parigp.php b/htdocs/application/libraries/geshi/geshi/parigp.php
index 1a5d4a7..9c6a143 100644
--- a/htdocs/application/libraries/geshi/geshi/parigp.php
+++ b/htdocs/application/libraries/geshi/geshi/parigp.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Charles R Greathouse IV (charles@crg4.com)
  * Copyright: 2011-2013 Charles R Greathouse IV (http://math.crg4.com/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/05/11
  *
  * PARI/GP language file for GeSHi.
@@ -13,7 +13,7 @@
  * -------
  * 2011/07/09 (1.0.8.11)
  *  -  First Release
- * 2013/02/05 (1.0.8.12)
+ * 2013/02/05 (1.0.8.13)
  *  -  Added 2.6.0 commands, default, member functions, and error-handling
  *
  * TODO (updated 2011/07/09)
diff --git a/htdocs/application/libraries/geshi/geshi/pascal.php b/htdocs/application/libraries/geshi/geshi/pascal.php
index 5b9d986..0d95af5 100644
--- a/htdocs/application/libraries/geshi/geshi/pascal.php
+++ b/htdocs/application/libraries/geshi/geshi/pascal.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Tux (tux@inamil.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/26
  *
  * Pascal language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/pcre.php b/htdocs/application/libraries/geshi/geshi/pcre.php
index 29bbf47..243121b 100644
--- a/htdocs/application/libraries/geshi/geshi/pcre.php
+++ b/htdocs/application/libraries/geshi/geshi/pcre.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/05/22
  *
  * PCRE language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/per.php b/htdocs/application/libraries/geshi/geshi/per.php
index b9117a2..8337823 100644
--- a/htdocs/application/libraries/geshi/geshi/per.php
+++ b/htdocs/application/libraries/geshi/geshi/per.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Lars Gersmann (lars.gersmann@gmail.com)
  * Copyright: (c) 2007 Lars Gersmann
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/06/03
  *
  * Per (forms) (FOURJ's Genero 4GL) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/perl.php b/htdocs/application/libraries/geshi/geshi/perl.php
index 15ab836..0a05708 100644
--- a/htdocs/application/libraries/geshi/geshi/perl.php
+++ b/htdocs/application/libraries/geshi/geshi/perl.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
  * Copyright: (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/20
  *
  * Perl language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/perl6.php b/htdocs/application/libraries/geshi/geshi/perl6.php
index 3bd5f0a..f063a6b 100644
--- a/htdocs/application/libraries/geshi/geshi/perl6.php
+++ b/htdocs/application/libraries/geshi/geshi/perl6.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: Kodi Arfer (kodiarfer {at} warpmail {period} net); forked from perl.php 1.0.8 by Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
  * Copyright: (c) 2009 Kodi Arfer, (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/11/07
  *
  * Perl 6 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/pf.php b/htdocs/application/libraries/geshi/geshi/pf.php
index 37b30fe..2f80e23 100644
--- a/htdocs/application/libraries/geshi/geshi/pf.php
+++ b/htdocs/application/libraries/geshi/geshi/pf.php
@@ -4,7 +4,7 @@
  * --------
  * Author: David Berard (david@nfrance.com)
  * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/10/16
  * Based on bash.php
  *
diff --git a/htdocs/application/libraries/geshi/geshi/phix.php b/htdocs/application/libraries/geshi/geshi/phix.php
new file mode 100644
index 0000000..a4f4e4e
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/phix.php
@@ -0,0 +1,439 @@
+<?php
+/*************************************************************************************
+ * phix.php
+ * ---------------------------------
+ * Author: Pete Lomax
+ * Copyright: (c) 2010 Nicholas Koceja
+ * Release Version: 1.0.9.0
+ * Date Started: 16/08/2015
+ *
+ * Phix language file for GeSHi.
+ *
+ * Author's note:  The colors are based on those of Edita.
+ *
+ * CHANGES
+ * -------
+ * <date-of-release> (1.0.8.9)
+ *  -  First Release
+ *
+ * TODO (updated <date-of-release>)
+ * -------------------------
+ * seperate the funtions from the procedures, and have a slight color change for each.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Phix',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(2 => '/\/\*(?:(?R)|.)+?\*\//s'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"', '"""', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // keywords
+            'and', 'as',
+            'break', 'by',
+            'case', 'constant',
+            'default', 'do',
+            'else', 'elsif', 'end', 'enum', 'exit',
+            'for', 'forward', 'function',
+            'global',
+            'if', 'include',
+            'not',
+            'or',
+            'procedure',
+            'return',
+            'switch',
+            'then', 'to', 'type',
+            'while', 'with', 'without',
+            'xor'
+        ),
+        2 => array( // directives
+            'console',
+            'debug',
+            'fallthru',
+            'fallthrough', 'format',
+            'gui',
+            'ilASM',
+            'jump_table',
+            'profile', 'profile_time',
+            'trace', 'type_check',
+            'warning'
+        ),
+        3 => array( // built-ins
+            'abort',
+            'abs',
+            'adjust_timedate',
+            'allocate',
+            'allocate_string',
+            'allocate_struct',
+            'allow_break',
+            'and_bits',
+            'append',
+            'arccos',
+            'arcsin',
+            'arctan',
+            'atom',
+            'atom_to_float32',
+            'atom_to_float64',
+            'atom_to_float80',
+
+            'bits_to_int',
+            'bk_color',
+            'bytes_to_int',
+
+            'call',
+            'call_back',
+            'call_func',
+            'call_proc',
+            'canonical_path',
+            'ceil',
+            'change_timezone',
+            'chdir',
+            'check_break',
+            'clear_screen',
+            'close',
+            'columnize',
+            'compare',
+            'command_line',
+            'cos',
+            'crash_file',
+            'crash_message',
+            'crash_routine',
+            'create_thread',
+            'current_dir',
+            'cursor',
+            'custom_sort',
+            'c_func',
+            'c_proc',
+
+            'date',
+            'day_of_week',
+            'day_of_year',
+            'db_close',
+            'db_compress',
+            'db_create',
+            'db_create_table',
+            'db_delete_record',
+            'db_delete_table',
+            'db_dump',
+            'db_fatal_id',
+            'db_find_key',
+            'db_insert',
+            'db_open',
+            'db_record_data',
+            'db_record_key',
+            'db_replace_data',
+            'db_select',
+            'db_select_table',
+            'db_table_list',
+            'db_table_size',
+            'define_c_func',
+            'define_c_proc',
+            'define_c_var',
+            'define_cfunc',
+            'define_cproc',
+            'define_struct',
+            'delete',
+            'delete_cs',
+            'delete_routine',
+            'dir',
+            'display_text_image',
+
+            'enter_cs',
+            'equal',
+            'exit_thread',
+
+            'factorial',
+            'factors',
+            'find',
+            'flatten',
+            'float32_to_atom',
+            'float64_to_atom',
+            'float80_to_atom',
+            'floor',
+            'flush',
+            'format_timedate',
+            'free',
+            'free_console',
+
+            'gcd',
+            'get',
+            'getc',
+            'getenv',
+            'gets',
+            'get_bytes',
+            'get_field_details',
+            'get_key',
+            'get_position',
+            'get_proper_path',
+            'get_screen_char',
+            'get_struct_field',
+            'get_struct_size',
+            'get_text',
+            'get_thread_exitcode',
+
+            'iif',
+            'iff',
+            'include_paths',
+            'init_cs',
+            'instance',
+            'integer',
+            'int_to_bits',
+            'int_to_bytes',
+            'is_leap_year',
+
+            'join',
+
+            'leave_cs',
+            'length',
+            'lock_file',
+            'log',
+            'lower',
+
+            'machine_bits',
+            'machine_func',
+            'machine_proc',
+            'match',
+            'max',
+            'mem_copy',
+            'mem_set',
+            'message_box',
+            'min',
+            'mod',
+
+            'not_bits',
+
+            'object',
+            'open',
+            'open_dll',
+            'or_bits',
+
+            'parse_date_string',
+            'peek',
+            'peek1s',
+            'peek1u',
+            'peek2s',
+            'peek2u',
+            'peek4s',
+            'peek4u',
+            'peek8s',
+            'peek8u',
+            'peekNS',
+            'peek_string',
+            'permute',
+            'platform',
+            'poke',
+            'poke1',
+            'poke2',
+            'poke4',
+            'poke8',
+            'pokeN',
+            'position',
+            'power',
+            'prepend',
+            'prime_factors',
+            'print',
+            'printf',
+            'prompt_number',
+            'prompt_string',
+            'puts',
+            'put_screen_char',
+
+            'rand',
+            'read_bitmap',
+            'remainder',
+            'repeat',
+            'resume_thread',
+            'reverse',
+            'rfind',
+            'round',
+            'routine_id',
+
+            'save_bitmap',
+            'save_text_image',
+            'scanf',
+            'scroll',
+            'seek',
+            'sequence',
+            'set_rand',
+            'set_struct_field',
+            'set_system_doevents',
+            'set_timedate_formats',
+            'set_timezone',
+            'set_unicode',
+            'sign',
+            'sin',
+            'sleep',
+            'sort',
+            'sprint',
+            'sprintf',
+            'sqrt',
+            'sq_abs',
+            'sq_add',
+            'sq_and',
+            'sq_and_bits',
+            'sq_arccos',
+            'sq_arcsin',
+            'sq_arctan',
+            'sq_atom',
+            'sq_ceil',
+            'sq_cos',
+            'sq_div',
+            'sq_eq',
+            'sq_floor',
+            'sq_floor_div',
+            'sq_ge',
+            'sq_gt',
+            'sq_int',
+            'sq_le',
+            'sq_log',
+            'sq_lower',
+            'sq_lt',
+            'sq_mod',
+            'sq_mul',
+            'sq_ne',
+            'sq_not',
+            'sq_not_bits',
+            'sq_or',
+            'sq_or_bits',
+            'sq_power',
+            'sq_rand',
+            'sq_round',
+            'sq_rmdr',
+            'sq_seq',
+            'sq_sign',
+            'sq_sin',
+            'sq_sqrt',
+            'sq_str',
+            'sq_sub',
+            'sq_tan',
+            'sq_trunc',
+            'sq_uminus',
+            'sq_upper',
+            'sq_xor',
+            'sq_xor_bits',
+            'string',
+            'substitute',
+            'sum',
+            'suspend_thread',
+            'system',
+            'system_exec',
+            'system_open',
+            'system_wait',
+
+            'tagset',
+            'tan',
+            'task_clock_stop',
+            'task_clock_start',
+            'task_create',
+            'task_list',
+            'task_schedule',
+            'task_self',
+            'task_status',
+            'task_suspend',
+            'task_yield',
+            'text_color',
+            'text_rows',
+            'time',
+            'timedate',
+            'timedelta',
+            'trunc',
+            'try_cs',
+
+            'unlock_file',
+            'upper',
+
+            'value',
+            'video_config',
+
+            'wait_key',
+            'wait_thread',
+            'walk_dir',
+            'where',
+            'wildcard_file',
+            'wildcard_match',
+            'wrap',
+
+            'xor_bits'
+        ),
+    ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '{', '}', '[', ']'
+        ),
+        1 => array(
+            '+', '-', '*', '/', '=', '&', '^', '?', ',', ':'
+        )
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008080;', // keywords
+            2 => 'color: #008080;', // directives
+            3 => 'color: #004080;'  // builtins
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #000080; font-style: italic;',
+            2 => 'color: #000080; font-style: italic;',
+            'MULTI' => 'color: #000080; font-style: italic;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009900; font-weight: bold;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #0000FF;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+        ),
+        'METHODS' => array( // Do not exist in Phix)
+            0 => ''
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;', // brackets
+            1 => 'color: #0000FF;'  // operators
+        ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array( // Never included in scripts.
+        )
+    ),
+    'REGEXPS' => array(),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/htdocs/application/libraries/geshi/geshi/php-brief.php b/htdocs/application/libraries/geshi/geshi/php-brief.php
index 36a960a..922c9d9 100644
--- a/htdocs/application/libraries/geshi/geshi/php-brief.php
+++ b/htdocs/application/libraries/geshi/geshi/php-brief.php
@@ -4,7 +4,7 @@
  * -------------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/02
  *
  * PHP (brief version) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/php.php b/htdocs/application/libraries/geshi/geshi/php.php
index fa50ee8..6b24840 100644
--- a/htdocs/application/libraries/geshi/geshi/php.php
+++ b/htdocs/application/libraries/geshi/geshi/php.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/20
  *
  * PHP language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/pic16.php b/htdocs/application/libraries/geshi/geshi/pic16.php
index 9058a86..bd742ad 100644
--- a/htdocs/application/libraries/geshi/geshi/pic16.php
+++ b/htdocs/application/libraries/geshi/geshi/pic16.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Phil Mattison (mattison@ohmikron.com)
  * Copyright: (c) 2008 Ohmikron Corp. (http://www.ohmikron.com/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/07/30
  *
  * PIC16 Assembler language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/pike.php b/htdocs/application/libraries/geshi/geshi/pike.php
index f5cc905..12dabf2 100644
--- a/htdocs/application/libraries/geshi/geshi/pike.php
+++ b/htdocs/application/libraries/geshi/geshi/pike.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Rick E. (codeblock@eighthbit.net)
  * Copyright: (c) 2009 Rick E.
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/12/10
  *
  * Pike language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/pixelbender.php b/htdocs/application/libraries/geshi/geshi/pixelbender.php
index 45afc17..d7bcc08 100644
--- a/htdocs/application/libraries/geshi/geshi/pixelbender.php
+++ b/htdocs/application/libraries/geshi/geshi/pixelbender.php
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Richard Olsson (r@richardolsson.se)
  * Copyright: (c) 2008 Richard Olsson (richardolsson.se)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/11/16
  *
  * Pixel Bender 1.0 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/pli.php b/htdocs/application/libraries/geshi/geshi/pli.php
index 32a0cb7..6f12c1f 100644
--- a/htdocs/application/libraries/geshi/geshi/pli.php
+++ b/htdocs/application/libraries/geshi/geshi/pli.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Robert AH Prins (robert@prino.org)
  * Copyright: (c) 2011 Robert AH Prins (http://hitchwiki.org/en/User:Prino)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/02/09
  *
  * PL/I language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/plsql.php b/htdocs/application/libraries/geshi/geshi/plsql.php
index 1a9edea..c2ad851 100644
--- a/htdocs/application/libraries/geshi/geshi/plsql.php
+++ b/htdocs/application/libraries/geshi/geshi/plsql.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Victor Engmark <victor.engmark@gmail.com>
  * Copyright: (c) 2006 Victor Engmark (http://l0b0.net/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/10/26
  *
  * Oracle 9.2 PL/SQL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/postgresql.php b/htdocs/application/libraries/geshi/geshi/postgresql.php
index 1f9d9e5..2816c6c 100644
--- a/htdocs/application/libraries/geshi/geshi/postgresql.php
+++ b/htdocs/application/libraries/geshi/geshi/postgresql.php
@@ -5,7 +5,7 @@
  * Author: Christophe Chauvet (christophe_at_kryskool_dot_org)
  * Contributors: Leif Biberg Kristensen <leif_at_solumslekt_dot_org> 2010-05-03
  * Copyright: (c) 2007 Christophe Chauvet (http://kryskool.org/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/07/20
  *
  * PostgreSQL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/postscript.php b/htdocs/application/libraries/geshi/geshi/postscript.php
index cbd10f6..00ee93c 100644
--- a/htdocs/application/libraries/geshi/geshi/postscript.php
+++ b/htdocs/application/libraries/geshi/geshi/postscript.php
@@ -4,14 +4,14 @@
  * -----
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2014 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2014/08/10
  *
  * PostScript language file for GeSHi.
  *
  * CHANGES
  * -------
- * 2014/08/10 (1.0.8.12)
+ * 2014/08/10 (1.0.8.13)
  *   -  First Release
  *
  * TODO (updated 2014/08/10)
diff --git a/htdocs/application/libraries/geshi/geshi/povray.php b/htdocs/application/libraries/geshi/geshi/povray.php
index 19d6c38..eb75d41 100644
--- a/htdocs/application/libraries/geshi/geshi/povray.php
+++ b/htdocs/application/libraries/geshi/geshi/povray.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Carl Fürstenberg (azatoth@gmail.com)
  * Copyright: © 2007 Carl Fürstenberg
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/07/11
  *
  * Povray language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/powerbuilder.php b/htdocs/application/libraries/geshi/geshi/powerbuilder.php
index 7b5c4fd..b93e7dd 100644
--- a/htdocs/application/libraries/geshi/geshi/powerbuilder.php
+++ b/htdocs/application/libraries/geshi/geshi/powerbuilder.php
@@ -4,7 +4,7 @@
  * ------
  * Author: Doug Porter (powerbuilder.geshi@gmail.com)
  * Copyright: (c) 2009 Doug Porter
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/07/13
  *
  * PowerBuilder (PowerScript) language file for GeSHi.
@@ -129,7 +129,8 @@ $language_data = array (
             'dragleave!', 'dragobject!', 'dragwithin!', 'drawobject!',
             'dropdownlistbox!', 'dropdownpicturelistbox!', 'drophighlighttreeitem!', 'dwobject!',
             'dynamicdescriptionarea!', 'dynamicstagingarea!', 'easteuropecharset!', 'editchanged!',
-            'editmask!', 'editmenu!', 'end!', 'endlabeledit!',
+            'editmask!', 'editmenu!', 'encodingansi!', 'encodingutf8!',
+            'encodingutf16le!', 'encodingutf16be!', 'end!', 'endlabeledit!',
             'enterprise!', 'enterpriseonlyfeature!', 'enumeratedtype!', 'enumerationdefinition!',
             'enumerationitemdefinition!', 'environment!', 'error!', 'errorlogging!',
             'eventnotexisterror!', 'eventwrongprototypeerror!', 'excel!', 'excel5!',
diff --git a/htdocs/application/libraries/geshi/geshi/powershell.php b/htdocs/application/libraries/geshi/geshi/powershell.php
index 2900abd..4230459 100644
--- a/htdocs/application/libraries/geshi/geshi/powershell.php
+++ b/htdocs/application/libraries/geshi/geshi/powershell.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Frode Aarebrot (frode@aarebrot.net)
  * Copyright: (c) 2008 Frode Aarebrot (http://www.aarebrot.net)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/06/20
  *
  * PowerShell language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/proftpd.php b/htdocs/application/libraries/geshi/geshi/proftpd.php
index 0668eec..99ae966 100644
--- a/htdocs/application/libraries/geshi/geshi/proftpd.php
+++ b/htdocs/application/libraries/geshi/geshi/proftpd.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/01/25
  *
  * ProFTPd language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/progress.php b/htdocs/application/libraries/geshi/geshi/progress.php
index dc99dbf..1541472 100644
--- a/htdocs/application/libraries/geshi/geshi/progress.php
+++ b/htdocs/application/libraries/geshi/geshi/progress.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Marco Aurelio de Pasqual (marcop@hdi.com.br)
  * Copyright: (c) 2008 Marco Aurelio de Pasqual, Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/07/11
  *
  * Progress language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/prolog.php b/htdocs/application/libraries/geshi/geshi/prolog.php
index e8b5df0..f3c8e8f 100644
--- a/htdocs/application/libraries/geshi/geshi/prolog.php
+++ b/htdocs/application/libraries/geshi/geshi/prolog.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/10/02
  *
  * Prolog language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/properties.php b/htdocs/application/libraries/geshi/geshi/properties.php
index b716018..3cbde9d 100644
--- a/htdocs/application/libraries/geshi/geshi/properties.php
+++ b/htdocs/application/libraries/geshi/geshi/properties.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Edy Hinzen
  * Copyright: (c) 2009 Edy Hinzen
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/04/03
  *
  * Property language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/providex.php b/htdocs/application/libraries/geshi/geshi/providex.php
index e2ab4a5..2d09be4 100644
--- a/htdocs/application/libraries/geshi/geshi/providex.php
+++ b/htdocs/application/libraries/geshi/geshi/providex.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Jeff Wilder (jeff@coastallogix.com)
  * Copyright:  (c) 2008 Coastal Logix (http://www.coastallogix.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/10/18
  *
  * ProvideX language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/purebasic.php b/htdocs/application/libraries/geshi/geshi/purebasic.php
index f685dd0..e40890b 100644
--- a/htdocs/application/libraries/geshi/geshi/purebasic.php
+++ b/htdocs/application/libraries/geshi/geshi/purebasic.php
@@ -4,7 +4,7 @@
  * -------
  * Author: GuShH
  * Copyright: (c) 2009 Gustavo Julio Fiorenza
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 13/06/2009
  *
  * PureBasic language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/pycon.php b/htdocs/application/libraries/geshi/geshi/pycon.php
index f6fd44b..31531a7 100644
--- a/htdocs/application/libraries/geshi/geshi/pycon.php
+++ b/htdocs/application/libraries/geshi/geshi/pycon.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/30
  *
  * Python language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/pys60.php b/htdocs/application/libraries/geshi/geshi/pys60.php
index 9b83c74..caedc2f 100644
--- a/htdocs/application/libraries/geshi/geshi/pys60.php
+++ b/htdocs/application/libraries/geshi/geshi/pys60.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Sohan Basak (ronnie.basak96 @gmail.com)
  * Copyright: (c) 2012 Sohan Basak (http://tothepower.tk),  Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/05/03
  *
  * Python for S60 language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/python.php b/htdocs/application/libraries/geshi/geshi/python.php
index 2c52484..3df07ea 100644
--- a/htdocs/application/libraries/geshi/geshi/python.php
+++ b/htdocs/application/libraries/geshi/geshi/python.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/30
  *
  * Python language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/q.php b/htdocs/application/libraries/geshi/geshi/q.php
index 5840b58..926ddbf 100644
--- a/htdocs/application/libraries/geshi/geshi/q.php
+++ b/htdocs/application/libraries/geshi/geshi/q.php
@@ -4,7 +4,7 @@
  * -----
  * Author: Ian Roddis (ian.roddis@proteanmind.net)
  * Copyright: (c) 2008 Ian Roddis (http://proteanmind.net)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/01/21
  *
  * q/kdb+ language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/qbasic.php b/htdocs/application/libraries/geshi/geshi/qbasic.php
index f4f898e..0a09b4d 100644
--- a/htdocs/application/libraries/geshi/geshi/qbasic.php
+++ b/htdocs/application/libraries/geshi/geshi/qbasic.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/20
  *
  * QBasic/QuickBASIC language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/qml.php b/htdocs/application/libraries/geshi/geshi/qml.php
index 1805f34..3aa3457 100644
--- a/htdocs/application/libraries/geshi/geshi/qml.php
+++ b/htdocs/application/libraries/geshi/geshi/qml.php
@@ -4,14 +4,14 @@
  * --------------
  * Author: J-P Nurmi <jpnurmi@gmail.com>
  * Copyright: (c) 2012-2014 J-P Nurmi <jpnurmi@gmail.com>
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/08/19
  *
  * QML language file for GeSHi.
  *
  * CHANGES
  * -------
- * 2014/06/29 (1.0.8.12)
+ * 2014/06/29 (1.0.8.13)
  *  - Synced QML types from Qt 5.3:
  *    http://qt-project.org/doc/qt-5/modules-qml.html
  * 2012/08/19
@@ -48,7 +48,7 @@ $language_data = array (
         // comments
         2 => "/(?<=[\\s^])(s|tr|y)\\/(?!\*)(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])*(?<!\s)\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?!\*)(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
         // property binding
-        3 => "/([a-z][\\w\\.]+)(?=:)/",
+        3 => "/([a-z][\\w\\.]*)(?=:)/",
         // TODO: property name (fixed length lookbehind assertion?)
         4 => "/(?<=property\\s+\\w+\\s+)(\\w+)/"
         ),
@@ -57,7 +57,7 @@ $language_data = array (
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-            'as','break','case','catch','continue','const','debugger',
+            'as','alias','break','case','catch','continue','const','debugger',
             'default','delete','do','else','finally','for','function',
             'if','import','in','instanceof','new','on','public','property',
             'readonly','return','signal','switch','this','throw','try',
diff --git a/htdocs/application/libraries/geshi/geshi/racket.php b/htdocs/application/libraries/geshi/geshi/racket.php
index 09d6bb8..2b25b9b 100644
--- a/htdocs/application/libraries/geshi/geshi/racket.php
+++ b/htdocs/application/libraries/geshi/geshi/racket.php
@@ -4,7 +4,7 @@
  * ----------
  * Author:          Tim Brown (tim@timb.net)
  * Copyright:   (c) 2013 Tim Brown ((https://github.com/tim-brown/geshi-racket))
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started:    2013-03-01
  *
  * Racket language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/rails.php b/htdocs/application/libraries/geshi/geshi/rails.php
index 2838719..f5683b8 100644
--- a/htdocs/application/libraries/geshi/geshi/rails.php
+++ b/htdocs/application/libraries/geshi/geshi/rails.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: Moises Deniz
  * Copyright: (c) 2005 Moises Deniz
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/03/21
  *
  * Ruby (with Ruby on Rails Framework) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/rbs.php b/htdocs/application/libraries/geshi/geshi/rbs.php
index 02c2fcf..76610d1 100644
--- a/htdocs/application/libraries/geshi/geshi/rbs.php
+++ b/htdocs/application/libraries/geshi/geshi/rbs.php
@@ -4,7 +4,7 @@
  * ------
  * Author: Deng Wen Gang (deng@priity.com)
  * Copyright: (c) 2013 Deng Wen Gang
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2013/01/15
  *
  * RBScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/rebol.php b/htdocs/application/libraries/geshi/geshi/rebol.php
index 7acb736..d11447a 100644
--- a/htdocs/application/libraries/geshi/geshi/rebol.php
+++ b/htdocs/application/libraries/geshi/geshi/rebol.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Lecanu Guillaume (Guillaume@LyA.fr)
  * Copyright: (c) 2004-2005 Lecanu Guillaume (Guillaume@LyA.fr)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/12/22
  *
  * Rebol language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/reg.php b/htdocs/application/libraries/geshi/geshi/reg.php
index f297839..e73c961 100644
--- a/htdocs/application/libraries/geshi/geshi/reg.php
+++ b/htdocs/application/libraries/geshi/geshi/reg.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Sean Hanna (smokingrope@gmail.com)
  * Copyright: (c) 2006 Sean Hanna
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 03/15/2006
  *
  * Microsoft Registry Editor language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/rexx.php b/htdocs/application/libraries/geshi/geshi/rexx.php
index 86f44a2..9e0a73e 100644
--- a/htdocs/application/libraries/geshi/geshi/rexx.php
+++ b/htdocs/application/libraries/geshi/geshi/rexx.php
@@ -6,7 +6,7 @@
  * Contributors:
  *    - Walter Pachl (pachl@chello.at)
  * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/01/07
  *
  * Rexx language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/robots.php b/htdocs/application/libraries/geshi/geshi/robots.php
index 8b1fb23..91fd87e 100644
--- a/htdocs/application/libraries/geshi/geshi/robots.php
+++ b/htdocs/application/libraries/geshi/geshi/robots.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Christian Lescuyer (cl@goelette.net)
  * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/02/17
  *
  * robots.txt language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/rpmspec.php b/htdocs/application/libraries/geshi/geshi/rpmspec.php
index 3ef70e6..55d722d 100644
--- a/htdocs/application/libraries/geshi/geshi/rpmspec.php
+++ b/htdocs/application/libraries/geshi/geshi/rpmspec.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Paul Grinberg (gri6507 TA unity-linux TOD org)
  * Copyright: (c) 2010 Paul Grinberg
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/04/27
  *
  * RPM Spec language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/rsplus.php b/htdocs/application/libraries/geshi/geshi/rsplus.php
index 7b15f51..6c8771d 100644
--- a/htdocs/application/libraries/geshi/geshi/rsplus.php
+++ b/htdocs/application/libraries/geshi/geshi/rsplus.php
@@ -7,7 +7,7 @@
  *  - Benilton Carvalho (beniltoncarvalho@gmail.com)
  *  - Fernando Henrique Ferraz Pereira da Rosa (mentus@gmail.com)
  * Copyright: (c) 2009 Ron Fredericks (http://www.LectureMaker.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/03/28
  *
  * R language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/ruby.php b/htdocs/application/libraries/geshi/geshi/ruby.php
index 8c96a23..b47953d 100644
--- a/htdocs/application/libraries/geshi/geshi/ruby.php
+++ b/htdocs/application/libraries/geshi/geshi/ruby.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Moises Deniz
  * Copyright: (c) 2007 Moises Deniz
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/03/21
  *
  * Ruby language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/rust.php b/htdocs/application/libraries/geshi/geshi/rust.php
index c213ab4..46d46c8 100644
--- a/htdocs/application/libraries/geshi/geshi/rust.php
+++ b/htdocs/application/libraries/geshi/geshi/rust.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Edward Hart (edward.dan.hart@gmail.com)
  * Copyright: (c) 2013 Edward Hart
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2013/10/20
  *
  * Rust language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/sas.php b/htdocs/application/libraries/geshi/geshi/sas.php
index a5f463c..31446d7 100644
--- a/htdocs/application/libraries/geshi/geshi/sas.php
+++ b/htdocs/application/libraries/geshi/geshi/sas.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Galen Johnson (solitaryr@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/12/27
  *
  * SAS language file for GeSHi. Based on the sas vim file.
diff --git a/htdocs/application/libraries/geshi/geshi/sass.php b/htdocs/application/libraries/geshi/geshi/sass.php
new file mode 100644
index 0000000..a4408a9
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/sass.php
@@ -0,0 +1,590 @@
+<?php
+/*************************************************************************************
+ * sass.php
+ * -------
+ * Author: Javier Eguiluz (javier.eguiluz@gmail.com)
+ * Copyright: (c) 2014 Javier Eguiluz (javier.eguiluz@gmail.com)
+ * Release Version: 1.0.9.0
+ * Date Started: 2014/05/10
+ *
+ * SASS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2014/05/10 (1.0.0)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Sass',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // properties
+        1 => array(
+            'azimuth',
+            'background-attachment',
+            'background-color',
+            'background-image',
+            'background-position',
+            'background-repeat',
+            'background',
+            'border-bottom-color',
+            'border-radius',
+            'border-top-left-radius',
+            'border-top-right-radius',
+            'border-bottom-right-radius',
+            'border-bottom-left-radius',
+            'border-bottom-style',
+            'border-bottom-width',
+            'border-left-color',
+            'border-left-style',
+            'border-left-width',
+            'border-right',
+            'border-right-color',
+            'border-right-style',
+            'border-right-width',
+            'border-top-color',
+            'border-top-style',
+            'border-top-width',
+            'border-bottom',
+            'border-collapse',
+            'border-left',
+            'border-width',
+            'border-color',
+            'border-spacing',
+            'border-style',
+            'border-top',
+            'border',
+            'box-shadow',
+            'caption-side',
+            'clear',
+            'clip',
+            'color',
+            'content',
+            'counter-increment',
+            'counter-reset',
+            'cue-after',
+            'cue-before',
+            'cue',
+            'cursor',
+            'direction',
+            'display',
+            'elevation',
+            'empty-cells',
+            'float',
+            'font-family',
+            'font-size',
+            'font-size-adjust',
+            'font-stretch',
+            'font-style',
+            'font-variant',
+            'font-weight',
+            'font',
+            'line-height',
+            'letter-spacing',
+            'list-style',
+            'list-style-image',
+            'list-style-position',
+            'list-style-type',
+            'margin-bottom',
+            'margin-left',
+            'margin-right',
+            'margin-top',
+            'margin',
+            'marker-offset',
+            'marks',
+            'max-height',
+            'max-width',
+            'min-height',
+            'min-width',
+            'orphans',
+            'outline',
+            'outline-color',
+            'outline-style',
+            'outline-width',
+            'overflow',
+            'padding-bottom',
+            'padding-left',
+            'padding-right',
+            'padding-top',
+            'padding',
+            'page',
+            'page-break-after',
+            'page-break-before',
+            'page-break-inside',
+            'pause-after',
+            'pause-before',
+            'pause',
+            'pitch',
+            'pitch-range',
+            'play-during',
+            'position',
+            'quotes',
+            'richness',
+            'right',
+            'size',
+            'speak-header',
+            'speak-numeral',
+            'speak-punctuation',
+            'speak',
+            'speech-rate',
+            'stress',
+            'table-layout',
+            'text-align',
+            'text-decoration',
+            'text-indent',
+            'text-shadow',
+            'text-transform',
+            'top',
+            'unicode-bidi',
+            'vertical-align',
+            'visibility',
+            'voice-family',
+            'volume',
+            'white-space',
+            'widows',
+            'width',
+            'word-spacing',
+            'z-index',
+            'bottom',
+            'left',
+            'height',
+            // media queries
+            'screen',
+            'orientation',
+            'min-device-width',
+            'max-device-width',
+        ),
+        // reserved words for values
+        2 => array(
+            // colors
+            'aqua',
+            'black',
+            'blue',
+            'fuchsia',
+            'gray',
+            'green',
+            'lime',
+            'maroon',
+            'navy',
+            'olive',
+            'orange',
+            'purple',
+            'red',
+            'silver',
+            'teal',
+            'white',
+            'yellow',
+            // media queries
+            'landscape',
+            'portrait',
+            // other
+            'above',
+            'absolute',
+            'always',
+            'armenian',
+            'aural',
+            'auto',
+            'avoid',
+            'baseline',
+            'behind',
+            'below',
+            'bidi-override',
+            'blink',
+            'block',
+            'bold',
+            'bolder',
+            'both',
+            'capitalize',
+            'center-left',
+            'center-right',
+            'center',
+            'circle',
+            'cjk-ideographic',
+            'close-quote',
+            'collapse',
+            'condensed',
+            'continuous',
+            'crop',
+            'crosshair',
+            'cross',
+            'cursive',
+            'dashed',
+            'decimal-leading-zero',
+            'decimal',
+            'default',
+            'digits',
+            'disc',
+            'dotted',
+            'double',
+            'e-resize',
+            'embed',
+            'extra-condensed',
+            'extra-expanded',
+            'expanded',
+            'fantasy',
+            'far-left',
+            'far-right',
+            'faster',
+            'fast',
+            'fixed',
+            'georgian',
+            'groove',
+            'hebrew',
+            'help',
+            'hidden',
+            'hide',
+            'higher',
+            'high',
+            'hiragana-iroha',
+            'hiragana',
+            'icon',
+            'inherit',
+            'inline-table',
+            'inline',
+            'inline-block',
+            'inset',
+            'inside',
+            'italic',
+            'justify',
+            'katakana-iroha',
+            'katakana',
+            'larger',
+            'large',
+            'left-side',
+            'leftwards',
+            'level',
+            'lighter',
+            'line-through',
+            'list-item',
+            'loud',
+            'lower-alpha',
+            'lower-greek',
+            'lower-roman',
+            'lowercase',
+            'ltr',
+            'lower',
+            'low',
+            'medium',
+            'message-box',
+            'middle',
+            'monospace',
+            'n-resize',
+            'narrower',
+            'ne-resize',
+            'no-close-quote',
+            'no-open-quote',
+            'no-repeat',
+            'none',
+            'normal',
+            'nowrap',
+            'nw-resize',
+            'oblique',
+            'once',
+            'open-quote',
+            'outset',
+            'outside',
+            'overline',
+            'pointer',
+            'px',
+            'relative',
+            'repeat-x',
+            'repeat-y',
+            'repeat',
+            'ridge',
+            'right-side',
+            'rightwards',
+            's-resize',
+            'sans-serif',
+            'scroll',
+            'se-resize',
+            'semi-condensed',
+            'semi-expanded',
+            'separate',
+            'serif',
+            'show',
+            'silent',
+            'slow',
+            'slower',
+            'small-caps',
+            'small-caption',
+            'smaller',
+            'soft',
+            'solid',
+            'spell-out',
+            'square',
+            'static',
+            'status-bar',
+            'super',
+            'sw-resize',
+            'table-caption',
+            'table-cell',
+            'table-column',
+            'table-column-group',
+            'table-footer-group',
+            'table-header-group',
+            'table-row',
+            'table-row-group',
+            'text',
+            'text-bottom',
+            'text-top',
+            'thick',
+            'thin',
+            'transparent',
+            'ultra-condensed',
+            'ultra-expanded',
+            'underline',
+            'upper-alpha',
+            'upper-latin',
+            'upper-roman',
+            'uppercase',
+            'url',
+            'visible',
+            'w-resize',
+            'wait',
+            'wider',
+            'x-fast',
+            'x-high',
+            'x-large',
+            'x-loud',
+            'x-low',
+            'x-small',
+            'x-soft',
+            'xx-large',
+            'xx-small',
+            'yes'
+        ),
+        // directives
+        3 => array(
+            '@at-root',
+            '@charset',
+            '@content',
+            '@debug',
+            '@each',
+            '@else',
+            '@elseif',
+            '@else if',
+            '@extend',
+            '@font-face',
+            '@for',
+            '@function',
+            '@if',
+            '@import',
+            '@include',
+            '@media',
+            '@mixin',
+            '@namespace',
+            '@page',
+            '@return',
+            '@warn',
+            '@while',
+        ),
+        // built-in Sass functions
+        4 => array(
+            'rgb',
+            'rgba',
+            'mix',
+            'hsl',
+            'hsla',
+            'hue',
+            'saturation',
+            'lightness',
+            'adjust-hue',
+            'lighten',
+            'darken',
+            'saturate',
+            'desaturate',
+            'grayscale',
+            'complement',
+            'invert',
+            'alpha',
+            'opacify',
+            'transparentize',
+            'adjust-color',
+            'scale-color',
+            'change-color',
+            'ie-hex-str',
+            'unquote',
+            'quote',
+            'str-length',
+            'str-insert',
+            'str-index',
+            'str-slice',
+            'to-upper-case',
+            'to-lower-case',
+            'percentage',
+            'round',
+            'ceil',
+            'floor',
+            'abs',
+            'min',
+            'max',
+            'random',
+            'length',
+            'nth',
+            'join',
+            'append',
+            'zip',
+            'index',
+            'list-separator',
+            'map-get',
+            'map-merge',
+            'map-remove',
+            'map-keys',
+            'map-values',
+            'map-has-key',
+            'keywords',
+            'feature-exists',
+            'variable-exists',
+            'global-variable-exists',
+            'function-exists',
+            'mixin-exists',
+            'inspect',
+            'type-of',
+            'unit',
+            'unitless',
+            'comparable',
+            'call',
+            'if',
+            'unique-id',
+        ),
+        // reserved words
+        5 => array(
+            '!important',
+            '!default',
+            '!optional',
+            'true',
+            'false',
+            'with',
+            'without',
+            'null',
+            'from',
+            'through',
+            'to',
+            'in',
+            'and',
+            'or',
+            'only',
+            'not',
+        ),
+    ),
+    'SYMBOLS' => array(
+        '(',
+        ')',
+        '{',
+        '}',
+        ':',
+        ';',
+        '>',
+        '+',
+        '*',
+        ',',
+        '^',
+        '=',
+        '&',
+        '~',
+        '!',
+        '%',
+        '?',
+        '...',
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #993333;',
+            3 => 'color: #990000;',
+            4 => 'color: #000000; font-weight: bold;',
+            5 => 'color: #009900;',
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+        ),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #00AA00;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+        ),
+        'METHODS' => array(),
+        'SYMBOLS' => array(
+            0 => 'color: #00AA00;'
+        ),
+        'SCRIPT' => array(),
+        'REGEXPS' => array(
+            0 => 'color: #cc00cc;',
+            1 => 'color: #6666ff;',
+            2 => 'color: #3333ff;',
+            3 => 'color: #933;',
+            4 => 'color: #ff6633;',
+            5 => 'color: #0066ff;',
+        )
+    ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        // Variables
+        0 => "[$][a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*",
+        // Hexadecimal colors
+        1 => "\#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})",
+        // CSS Pseudo classes
+        // note: & is needed for &gt; (i.e. > )
+        2 => "(?<!\\\\):(?!\d)[a-zA-Z0-9\-]+\b(?:\s*(?=[\{\.#a-zA-Z,:+*&](.|\n)|<\|))",
+        // Measurements
+        3 => "[+\-]?(\d+|(\d*\.\d+))(em|ex|pt|px|cm|in|%)",
+        // Interpolation
+        4 => "(\#\{.*\})",
+        // Browser prefixed properties
+        5 => "(\-(moz|ms|o|webkit)\-[a-z\-]*)",
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 2,
+);
diff --git a/htdocs/application/libraries/geshi/geshi/scala.php b/htdocs/application/libraries/geshi/geshi/scala.php
index dcfb277..d288eb0 100644
--- a/htdocs/application/libraries/geshi/geshi/scala.php
+++ b/htdocs/application/libraries/geshi/geshi/scala.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Franco Lombardo (franco@francolombardo.net)
  * Copyright: (c) 2008 Franco Lombardo, Benny Baumann
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/02/08
  *
  * Scala language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/scheme.php b/htdocs/application/libraries/geshi/geshi/scheme.php
index 2a6c972..3230d5f 100644
--- a/htdocs/application/libraries/geshi/geshi/scheme.php
+++ b/htdocs/application/libraries/geshi/geshi/scheme.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Jon Raphaelson (jonraphaelson@gmail.com)
  * Copyright: (c) 2005 Jon Raphaelson, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/30
  *
  * Scheme language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/scilab.php b/htdocs/application/libraries/geshi/geshi/scilab.php
index b0951d9..6b35520 100644
--- a/htdocs/application/libraries/geshi/geshi/scilab.php
+++ b/htdocs/application/libraries/geshi/geshi/scilab.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Christophe David (geshi@christophedavid.org)
  * Copyright: (c) 2008 Christophe David (geshi@christophedavid.org)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/08/04
  *
  * SciLab language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/scl.php b/htdocs/application/libraries/geshi/geshi/scl.php
index 1401dcd..761a0ac 100644
--- a/htdocs/application/libraries/geshi/geshi/scl.php
+++ b/htdocs/application/libraries/geshi/geshi/scl.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Leonhard Hösch (leonhard.hoesch@siemens.com)
  * Copyright: (c) 2008 by Leonhard Hösch (siemens.de)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/09/25
  *
  * SCL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/sdlbasic.php b/htdocs/application/libraries/geshi/geshi/sdlbasic.php
index 90b06ab..170c665 100644
--- a/htdocs/application/libraries/geshi/geshi/sdlbasic.php
+++ b/htdocs/application/libraries/geshi/geshi/sdlbasic.php
@@ -4,7 +4,7 @@
  * ------------
  * Author: Roberto Rossi
  * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/08/19
  *
  * sdlBasic (http://sdlbasic.sf.net) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/smalltalk.php b/htdocs/application/libraries/geshi/geshi/smalltalk.php
index bd6b404..d57e543 100644
--- a/htdocs/application/libraries/geshi/geshi/smalltalk.php
+++ b/htdocs/application/libraries/geshi/geshi/smalltalk.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Bananeweizen (Bananeweizen@gmx.de)
  * Copyright: (c) 2005 Bananeweizen (www.bananeweizen.de)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/03/27
  *
  * Smalltalk language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/smarty.php b/htdocs/application/libraries/geshi/geshi/smarty.php
index 5c22415..cb8833f 100644
--- a/htdocs/application/libraries/geshi/geshi/smarty.php
+++ b/htdocs/application/libraries/geshi/geshi/smarty.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Alan Juden (alan@judenware.org)
  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/07/10
  *
  * Smarty template language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/spark.php b/htdocs/application/libraries/geshi/geshi/spark.php
index 4999e78..30213ec 100644
--- a/htdocs/application/libraries/geshi/geshi/spark.php
+++ b/htdocs/application/libraries/geshi/geshi/spark.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Phil Thornley (tux@inmail.cz)
  * Copyright: (c) 2004 Phil Thornley (http://www.sparksure.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/08/22
  *
  * SPARK language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/sparql.php b/htdocs/application/libraries/geshi/geshi/sparql.php
index feb1f98..68aaa5f 100644
--- a/htdocs/application/libraries/geshi/geshi/sparql.php
+++ b/htdocs/application/libraries/geshi/geshi/sparql.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Karima Rafes (karima.rafes@bordercloud.com)
  * Copyright: (c) 2011 Bourdercloud.com
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/11/05
  *
  * SPARQL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/sql.php b/htdocs/application/libraries/geshi/geshi/sql.php
index 47c5032..b386729 100644
--- a/htdocs/application/libraries/geshi/geshi/sql.php
+++ b/htdocs/application/libraries/geshi/geshi/sql.php
@@ -6,7 +6,7 @@
  * Contributors:
  *  - Jürgen Thomas (Juergen.Thomas@vs-polis.de)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * SQL language file for GeSHi.
@@ -71,8 +71,8 @@ $language_data = array (
             'DATA', 'DATABASE', 'DATABASES', 'DATE', 'DAY', 'DEC', 'DECIMAL', 'DECLARE',
             'DEFAULT', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE', 'DISTINCT', 'DOUBLE',
             'DOMAIN', 'DROP',
-            'ELSE', 'ENCLOSED', 'END', 'ESCAPED', 'EXCEPT', 'EXEC', 'EXECUTE', 'EXISTS', 'EXP',
-            'EXPLAIN', 'EXTRACT',
+            'ELSE', 'ELSEIF', 'ENCLOSED', 'END', 'ESCAPED', 'EXCEPT', 'EXEC', 'EXECUTE', 'EXISTS',
+            'EXP', 'EXPLAIN', 'EXTRACT',
             'FALSE', 'FIELD', 'FIELDS', 'FILTER', 'FIRST', 'FLOAT', 'FLOOR', 'FLUSH', 'FOR',
             'FOREIGN', 'FROM', 'FULL', 'FUNCTION',
             'GET', 'GROUP', 'GROUPING', 'GO', 'GOTO', 'GRANT', 'GRANTED',
diff --git a/htdocs/application/libraries/geshi/geshi/standardml.php b/htdocs/application/libraries/geshi/geshi/standardml.php
index 970aa11..9979ac5 100644
--- a/htdocs/application/libraries/geshi/geshi/standardml.php
+++ b/htdocs/application/libraries/geshi/geshi/standardml.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: eldesh (nephits@gmail.com)
  * Copyright: (c) 2014 eldesh (http://d.hatena.ne.jp/eldesh/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2014/02/04
  *
  * SML (StandardML'97) language file for GeSHi.
@@ -68,12 +68,12 @@ $language_data = array (
             /* deprecated: SML90 */
             'abstype',
 
-            'and', 'andalso', 'as', 'begin', 'case', 'datatype', 'else',
+            'and', 'andalso', 'as', 'case', 'datatype', 'else',
             'end', 'exception', 'fn', 'fun', 'functor',
-            'if', 'in', 'infix', 'infixr', 'include', 'let', 'local', 'nonfix',
+            'if', 'in', 'infix', 'infixr', 'let', 'local', 'nonfix',
             'of', 'op', 'open', 'orelse',
             'rec', 'raise', 'sharing', 'sig', 'signature', 'struct', 'structure', 'then',
-            'type', 'val', 'while', 'where', 'with', 'withtype'
+            'type', 'val', 'while', 'with', 'withtype'
             ),
         /* Top-level type and constructors */
         2 => array(
diff --git a/htdocs/application/libraries/geshi/geshi/stonescript.php b/htdocs/application/libraries/geshi/geshi/stonescript.php
index e1697d8..6ea1971 100644
--- a/htdocs/application/libraries/geshi/geshi/stonescript.php
+++ b/htdocs/application/libraries/geshi/geshi/stonescript.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Archimmersion ( based on ruby.php by Moises Deniz )
  * Copyright: (c) 2011 Archimmersion ( http://www.archimmersion.com )
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/03/30
  *
  * StoneScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/swift.php b/htdocs/application/libraries/geshi/geshi/swift.php
new file mode 100644
index 0000000..4069035
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/swift.php
@@ -0,0 +1,557 @@
+<?php
+/*************************************************************************************
+ * swift.php
+ * ----------
+ * Author: Ken Woo (ikenwoo@gmail.com)
+ * Copyright: (c) 2015 Ken Woo
+ * Release Version: 1.0.9.0
+ * Date Started: 2015/05/20
+ *
+ * Swift language file for GeSHi.
+ * To mirror official Apple documentation, set the overall style like so:
+ * $geshi->set_overall_style('font-family: Menlo, monospace; font-size: 0.85em; color: #508187;', false);
+ *
+ * CHANGES
+ * -------
+ * 2015/05/20
+ *  -   First Release
+ *
+ * TODO (updated 2015/05/20)
+ * -------------------------
+ *  -   Only added keywords for Swift, Foundation, Core Foundation, Core Graphics, UIKit and AppKit.
+ * There are many other frameworks that can be added like SpriteKit, MapKit, HealthKit, etc.
+ *  -   Hex regex is a bit wonky when combined with method highlghting and not working
+ *      with negative exponents
+ *  -   Swift strings can include expressions via "sum is: \( 2 + 3 )" and the expression
+ *      shouldn't be highlighted as a string. This isn't supported yet.
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Swift',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' => array(
+        # Decimals
+        0 => '\b[0-9][0-9_]*(\.[0-9][0-9_]*)?([eE][+-]?[0-9][0-9_]*)?\b',
+        # Hex
+        1 => '\b0x[0-9A-Fa-f][0-9A-Fa-f_]*((\.[0-9A-Fa-f][0-9A-Fa-f_]*)?([pP][+-]?[0-9][0-9_]*))?\b',
+        # Octal
+        2 => '\b0o[0-7][0-7_]*\b',
+        # Binary
+        3 => '\b0b[01][01_]*\b'
+    ),
+    'KEYWORDS' => array(
+        /*
+        ** Swift Keywords
+        */
+        1 => array(
+            'Protocol', 'Self', 'Type', 'as', 'associativity', 'awillSet', 'break', 'case', 'class',
+            'continue', 'convenience', 'default', 'deinit', 'didSet', 'do', 'dynamic', 'dynamicType',
+            'else', 'enum', 'extension', 'fallthrough', 'false', 'final', 'for', 'func', 'get', 'if',
+            'import', 'in', 'infix', 'init', 'inout', 'internal', 'is', 'lazy', 'left', 'let', 'mutating',
+            'nil', 'none', 'nonmutating', 'operator', 'optional', 'override', 'postfix', 'precedence',
+            'prefix', 'private', 'protocol', 'public', 'required', 'return', 'right', 'self', 'set',
+            'static', 'struct', 'subscript', 'super', 'switch', 'true', 'typealias', 'unowned', 'var',
+            'weak', 'where', 'while', '__COLUMN__', '__FILE__', '__FUNCTION__', '__LINE__',
+        ),
+
+        /*
+        ** Swift Attributes
+        */
+        2 => array(
+            '@availability', '@autoclosure', '@IBAction', '@IBDesignable', '@IBInspectable', '@IBOutlet',
+            '@noescape', '@noreturn', '@NSApplicationMain', '@NSCopying', '@NSManaged', '@objc', '@UIApplicationMain'
+        ),
+        /*
+        ** Swift Builtin Functions
+        **
+        */
+        3 => array(
+            'abs', 'advance', 'alignof', 'alignofValue', 'assert', 'assertionFailure', 'contains', 'count', 'debugPrint',
+            'debugPrintln', 'distance', 'dropFirst', 'dropLast', 'dump', 'enumerate', 'equal', 'extend', 'fatalError',
+            'filter', 'find', 'first', 'flatMap', 'getVaList', 'indices', 'insert', 'isEmpty', 'isUniquelyReferenced',
+            'isUniquelyReferencedNonObjC', 'join', 'last', 'lexicographicalCompare', 'map', 'max', 'maxElement',
+            'min', 'minElement', 'numericCast', 'overlaps', 'partition', 'precondition', 'preconditionFailure',
+            'print', 'println', 'reduce', 'reflect', 'removeAll', 'removeAtIndex', 'removeLast', 'removeRange', 'reverse',
+            'sizeof', 'sizeofValue', 'sort', 'sorted', 'splice', 'split', 'startsWith', 'stride', 'strideof', 'strideofValue',
+            'suffix', 'swap', 'toDebugString', 'toString', 'transcode', 'underestimateCount', 'unsafeAddressOf', 'unsafeBitCast',
+            'unsafeDowncast', 'unsafeUnwrap', 'withExtendedLifetime', 'withUnsafeMutablePointer', 'withUnsafeMutablePointers',
+            'withUnsafePointer', 'withUnsafePointers', 'withVaList', 'zip'
+        ),
+        /*
+         ** Swift Types
+        */
+        4 => array(
+            'Array', 'ArraySlice', 'AutoreleasingUnsafeMutablePointer', 'BidirectionalReverseView', 'Bit', 'Bool',
+            'CFunctionPointer', 'COpaquePointer', 'CVaListPointer', 'Character', 'ClosedInterval', 'CollectionOfOne',
+            'ContiguousArray', 'Dictionary', 'DictionaryGenerator', 'DictionaryIndex', 'Double', 'EmptyCollection',
+            'EmptyGenerator', 'EnumerateGenerator', 'EnumerateSequence', 'FilterCollectionView', 'FilterCollectionViewIndex',
+            'FilterGenerator', 'FilterSequenceView', 'Float', 'Float80', 'FloatingPointClassification', 'GeneratorOf',
+            'GeneratorOfOne', 'GeneratorSequence', 'HalfOpenInterval', 'ImplicitlyUnwrappedOptional', 'IndexingGenerator',
+            'Int', 'Int16', 'Int32', 'Int64', 'Int8', 'LazyBidirectionalCollection', 'LazyForwardCollection',
+            'LazyRandomAccessCollection', 'LazySequence', 'ManagedBuffer', 'ManagedBufferPointer', 'ManagedProtoBuffer',
+            'MapCollectionView', 'MapSequenceGenerator', 'MapSequenceView', 'MirrorDisposition', 'NonObjectiveCBase',
+            'ObjectIdentifier', 'Optional', 'PermutationGenerator', 'Process', 'QuickLookObject', 'RandomAccessReverseView',
+            'Range', 'RangeGenerator', 'RawByte', 'Repeat', 'ReverseBidirectionalIndex', 'ReverseRandomAccessIndex',
+            'SequenceOf', 'Set', 'SetGenerator', 'SetIndex', 'SinkOf', 'StaticString', 'StrideThrough', 'StrideThroughGenerator',
+            'StrideTo', 'StrideToGenerator', 'String', 'String.Index', 'String.UTF16View', 'String.UTF16View.Index',
+            'String.UTF8View', 'String.UTF8View.Index', 'String.UnicodeScalarView', 'String.UnicodeScalarView.Generator',
+            'String.UnicodeScalarView.Index', 'UInt', 'UInt16', 'UInt32', 'UInt64', 'UInt8', 'UTF16', 'UTF32', 'UTF8',
+            'UnicodeDecodingResult', 'UnicodeScalar', 'UnicodeScalar.UTF16View', 'Unmanaged', 'UnsafeBufferPointer',
+            'UnsafeBufferPointerGenerator', 'UnsafeMutableBufferPointer', 'UnsafeMutablePointer', 'UnsafePointer',
+            'VaListBuilder', 'Zip2', 'ZipGenerator2'
+        ),
+        /*
+        ** Swift Type Aliases
+        */
+        5 => array(
+            'Any', 'AnyClass', 'CBool', 'CChar', 'CChar16', 'CChar32', 'CDouble', 'CFloat', 'CInt', 'CLong',
+            'CLongLong', 'CShort', 'CSignedChar', 'CUnsignedChar', 'CUnsignedInt', 'CUnsignedLong', 'CUnsignedLongLong',
+            'CUnsignedShort', 'CWideChar', 'ExtendedGraphemeClusterType', 'Float32', 'Float64', 'FloatLiteralType', 'IntMax',
+            'IntegerLiteralType', 'StringLiteralType', 'UIntMax', 'UWord', 'UnicodeScalarType', 'Void', 'Word'
+        ),
+        /*
+        ** Swift Protocols
+        */
+        6 => array(
+            'AbsoluteValuable', 'AnyObject', 'ArrayLiteralConvertible', 'BidirectionalIndexType', 'BitwiseOperationsType',
+            'BooleanLiteralConvertible', 'BooleanType', 'CVarArgType', 'CollectionType', 'Comparable', 'DebugPrintable',
+            'DictionaryLiteralConvertible', 'Equatable', 'ExtendedGraphemeClusterLiteralConvertible', 'ExtensibleCollectionType',
+            'FloatLiteralConvertible', 'FloatingPointType', 'ForwardIndexType', 'GeneratorType', 'Hashable', 'IntegerArithmeticType',
+            'IntegerLiteralConvertible', 'IntegerType', 'IntervalType', 'MirrorType', 'MutableCollectionType', 'MutableSliceable',
+            'NilLiteralConvertible', 'OutputStreamType', 'Printable', 'RandomAccessIndexType', 'RangeReplaceableCollectionType',
+            'RawOptionSetType', 'RawRepresentable', 'Reflectable', 'SequenceType', 'SignedIntegerType', 'SignedNumberType',
+            'SinkType', 'Sliceable', 'Streamable', 'Strideable', 'StringInterpolationConvertible', 'StringLiteralConvertible',
+            'UnicodeCodecType', 'UnicodeScalarLiteralConvertible', 'UnsignedIntegerType', '_ArrayBufferType', '_ArrayType',
+            '_BidirectionalIndexType', '_CVarArgPassedAsDouble', '_CocoaStringType', '_CollectionType', '_Comparable',
+            '_DestructorSafeContainer', '_ExtensibleCollectionType', '_ForwardIndexType', '_Incrementable', '_IntegerArithmeticType',
+            '_IntegerType', '_NSArrayCoreType', '_NSCopyingType', '_NSDictionaryCoreType', '_NSDictionaryType', '_NSEnumeratorType',
+            '_NSFastEnumerationType', '_NSSetCoreType', '_NSSetType', '_NSStringCoreType', '_ObjectiveCBridgeable', '_PointerType',
+            '_RandomAccessIndexType', '_RawOptionSetType', '_SequenceType', '_Sequence_Type', '_ShadowProtocol', '_SignedIntegerType',
+            '_SignedNumberType', '_Sliceable', '_Strideable', '_StringElementType', '_UnsignedIntegerType', '__ArrayType'
+        ),
+
+        /*
+        ** Foundation Classes
+        */
+        7 => array(
+            'NSObject', 'NSAffineTransform', 'NSAppleEventDescriptor', 'NSAppleEventManager', 'NSAppleScript', 'NSArray', 'NSMutableArray',
+            'NSAssertionHandler', 'NSAttributedString', 'NSMutableAttributedString', 'NSAutoreleasePool', 'NSBackgroundActivityScheduler',
+            'NSBundle', 'NSCache', 'NSCachedURLResponse', 'NSCalendar', 'NSCharacterSet', 'NSMutableCharacterSet', 'NSClassDescription',
+            'NSScriptClassDescription', 'NSCoder', 'NSArchiver', 'NSKeyedArchiver', 'NSKeyedUnarchiver', 'NSPortCoder', 'NSUnarchiver',
+            'NSCondition', 'NSConditionLock', 'NSConnection', 'NSData', 'NSMutableData', 'NSPurgeableData', 'NSDate', 'NSCalendarDate',
+            'NSDateComponents', 'NSDecimalNumberHandler', 'NSDictionary', 'NSMutableDictionary', 'NSDistantObjectRequest', 'NSDistributedLock',
+            'NSEnumerator', 'NSDirectoryEnumerator', 'NSError', 'NSException', 'NSExpression', 'NSExtensionContext', 'NSExtensionItem',
+            'NSFileAccessIntent', 'NSFileCoordinator', 'NSFileHandle', 'NSFileManager', 'NSFileSecurity', 'NSFileVersion', 'NSFileWrapper',
+            'NSFormatter', 'NSByteCountFormatter', 'NSDateComponentsFormatter', 'NSDateFormatter', 'NSDateIntervalFormatter',
+            'NSEnergyFormatter', 'NSLengthFormatter', 'NSMassFormatter', 'NSNumberFormatter', 'NSGarbageCollector', 'NSHashTable', 'NSHost',
+            'NSHTTPCookie', 'NSHTTPCookieStorage', 'NSIndexPath', 'NSIndexSet', 'NSMutableIndexSet', 'NSInvocation', 'NSItemProvider',
+            'NSJSONSerialization', 'NSLinguisticTagger', 'NSLocale', 'NSLock', 'NSMapTable', 'NSMetadataItem', 'NSMetadataQuery',
+            'NSMetadataQueryAttributeValueTuple', 'NSMetadataQueryResultGroup', 'NSMethodSignature', 'NSNetService', 'NSNetServiceBrowser',
+            'NSNotification', 'NSNotificationCenter', 'NSDistributedNotificationCenter', 'NSNotificationQueue', 'NSNull', 'NSOperation',
+            'NSBlockOperation', 'NSInvocationOperation', 'NSOperationQueue', 'NSOrderedSet', 'NSMutableOrderedSet', 'NSOrthography', 'NSPipe',
+            'NSPointerArray', 'NSPointerFunctions', 'NSPort', 'NSMachPort', 'NSMessagePort', 'NSSocketPort', 'NSPortMessage', 'NSPortNameServer',
+            'NSMachBootstrapServer', 'NSMessagePortNameServer', 'NSSocketPortNameServer', 'NSPositionalSpecifier', 'NSPredicate',
+            'NSComparisonPredicate', 'NSCompoundPredicate', 'NSProcessInfo', 'NSProgress', 'NSPropertyListSerialization', 'NSRecursiveLock',
+            'NSRegularExpression', 'NSDataDetector', 'NSRunLoop', 'NSScanner', 'NSScriptCoercionHandler', 'NSScriptCommand', 'NSCloneCommand',
+            'NSCloseCommand', 'NSCountCommand', 'NSCreateCommand', 'NSDeleteCommand', 'NSExistsCommand', 'NSGetCommand', 'NSMoveCommand',
+            'NSQuitCommand', 'NSSetCommand', 'NSScriptCommandDescription', 'NSScriptExecutionContext', 'NSScriptObjectSpecifier',
+            'NSIndexSpecifier', 'NSMiddleSpecifier', 'NSNameSpecifier', 'NSPropertySpecifier', 'NSRandomSpecifier', 'NSRangeSpecifier',
+            'NSRelativeSpecifier', 'NSUniqueIDSpecifier', 'NSWhoseSpecifier', 'NSScriptSuiteRegistry', 'NSScriptWhoseTest', 'NSLogicalTest',
+            'NSSpecifierTest', 'NSSet', 'NSMutableSet', 'NSCountedSet', 'NSSortDescriptor', 'NSSpellServer', 'NSStream', 'NSInputStream',
+            'NSOutputStream', 'NSString', 'NSMutableString', 'NSTask', 'NSTextCheckingResult', 'NSThread', 'NSTimer', 'NSTimeZone',
+            'NSUbiquitousKeyValueStore', 'NSUndoManager', 'NSURL', 'NSURLAuthenticationChallenge', 'NSURLCache', 'NSURLComponents',
+            'NSURLConnection', 'NSURLCredential', 'NSURLCredentialStorage', 'NSURLDownload', 'NSURLHandle', 'NSURLProtectionSpace',
+            'NSURLProtocol', 'NSURLQueryItem', 'NSURLRequest', 'NSMutableURLRequest', 'NSURLResponse', 'NSHTTPURLResponse', 'NSURLSession',
+            'NSURLSessionConfiguration', 'NSURLSessionTask', 'NSURLSessionDataTask', 'NSURLSessionUploadTask', 'NSURLSessionDownloadTask',
+            'NSUserActivity', 'NSUserDefaults', 'NSUserNotification', 'NSUserNotificationAction', 'NSUserNotificationCenter',
+            'NSUserScriptTask', 'NSUserAppleScriptTask', 'NSUserAutomatorTask', 'NSUserUnixTask', 'NSUUID', 'NSValue', 'NSNumber',
+            'NSDecimalNumber', 'NSValueTransformer', 'NSXMLNode', 'NSXMLDocument', 'NSXMLDTD', 'NSXMLDTDNode', 'NSXMLElement', 'NSXMLParser',
+            'NSXPCConnection', 'NSXPCInterface', 'NSXPCListener', 'NSXPCListenerEndpoint', 'NSProxy', 'NSDistantObject', 'NSProtocolChecker'
+        ),
+        /*
+        ** Foundation Protocols
+        */
+        8 => array(
+            'NSCacheDelegate', 'NSCoding', 'NSComparisonMethods', 'NSConnectionDelegate', 'NSCopying', 'NSDecimalNumberBehaviors',
+            'NSDiscardableContent', 'NSErrorRecoveryAttempting', 'NSExtensionRequestHandling', 'NSFastEnumeration', 'NSFileManagerDelegate',
+            'NSFilePresenter', 'NSKeyValueCoding', 'NSKeyValueObserving', 'NSKeyedArchiverDelegate', 'NSKeyedUnarchiverDelegate', 'NSLocking',
+            'NSMachPortDelegate', 'NSMetadataQueryDelegate', 'NSMutableCopying', 'NSNetServiceBrowserDelegate', 'NSNetServiceDelegate',
+            'NSPortDelegate', 'NSScriptKeyValueCoding', 'NSScriptObjectSpecifiers', 'NSScriptingComparisonMethods',
+            'NSSecureCoding', 'NSSpellServerDelegate', 'NSStreamDelegate', 'NSURLAuthenticationChallengeSender',
+            'NSURLConnectionDataDelegate', 'NSURLConnectionDelegate', 'NSURLDownloadDelegate', 'NSURLHandleClient', 'NSURLProtocolClient',
+            'NSURLSessionDataDelegate', 'NSURLSessionDelegate', 'NSURLSessionDownloadDelegate', 'NSURLSessionTaskDelegate',
+            'NSUserActivityDelegate', 'NSUserNotificationCenterDelegate', 'NSXMLParserDelegate', 'NSXPCListenerDelegate',
+            'NSXPCProxyCreating'
+        ),
+        /*
+        ** Core Foundation Protocols
+        **
+        */
+        9 => array(
+            'CFAllocator', 'CFArray', 'CFAttributedString', 'CFBag', 'CFBinaryHeap', 'CFBitVector', 'CFBoolean', 'CFBundle', 'CFCalendar',
+            'CFCharacterSet', 'CFData', 'CFDate', 'CFDateFormatter', 'CFDictionary', 'CFError', 'CFFileDescriptor', 'CFLocale', 'CFMachPort',
+            'CFMessagePort', 'CFMutableArray', 'CFMutableAttributedString', 'CFMutableBag', 'CFMutableBitVector', 'CFMutableCharacterSet',
+            'CFMutableData', 'CFMutableDictionary', 'CFMutableSet', 'CFMutableString', 'CFNotificationCenter', 'CFNull', 'CFNumber',
+            'CFNumberFormatter', 'CFPlugIn', 'CFPlugInInstance', 'CFPropertyList', 'CFReadStream', 'CFRunLoop', 'CFRunLoopObserver',
+            'CFRunLoopSource', 'CFRunLoopTimer', 'CFSet', 'CFSocket', 'CFString', 'CFStringTokenizer', 'CFTimeZone', 'CFTree', 'CFType', 'CFURL',
+            'CFUUID', 'CFUserNotification', 'CFWriteStream', 'CFXMLNode', 'CFXMLParser', 'CFXMLTree'
+        ),
+
+        /*
+        ** Core Foundation Data Types
+        **
+        */
+        10 => array(
+            'CFAbsoluteTime', 'CFAllocatorContext', 'CFAllocatorRef', 'CFArrayCallBacks', 'CFArrayRef', 'CFAttributedStringRef',
+            'CFBagCallBacks', 'CFBagRef', 'CFBinaryHeapCallBacks', 'CFBinaryHeapCompareContext', 'CFBinaryHeapRef', 'CFBit', 'CFBitVectorRef',
+            'CFBooleanRef', 'CFBundleRef', 'CFBundleRefNum', 'CFCalendarRef', 'CFCharacterSetPredefinedSet',
+            'CFCharacterSetPredefinedSet.AlphaNumeric', 'CFCharacterSetPredefinedSet.CapitalizedLetter',
+            'CFCharacterSetPredefinedSet.Control', 'CFCharacterSetPredefinedSet.DecimalDigit',
+            'CFCharacterSetPredefinedSet.Decomposable', 'CFCharacterSetPredefinedSet.Illegal', 'CFCharacterSetPredefinedSet.Letter',
+            'CFCharacterSetPredefinedSet.LowercaseLetter', 'CFCharacterSetPredefinedSet.Newline', 'CFCharacterSetPredefinedSet.NonBase',
+            'CFCharacterSetPredefinedSet.Punctuation', 'CFCharacterSetPredefinedSet.Symbol',
+            'CFCharacterSetPredefinedSet.UppercaseLetter', 'CFCharacterSetPredefinedSet.Whitespace',
+            'CFCharacterSetPredefinedSet.WhitespaceAndNewline', 'CFCharacterSetRef', 'CFDataRef', 'CFDataSearchFlags', 'CFDateFormatterRef',
+            'CFDateFormatterStyle', 'CFDateFormatterStyle.FullStyle', 'CFDateFormatterStyle.LongStyle', 'CFDateFormatterStyle.MediumStyle',
+            'CFDateFormatterStyle.NoStyle', 'CFDateFormatterStyle.ShortStyle', 'CFDateRef', 'CFDictionaryKeyCallBacks', 'CFDictionaryRef',
+            'CFDictionaryValueCallBacks', 'CFErrorRef', 'CFFileDescriptorCallBack', 'CFFileDescriptorContext',
+            'CFFileDescriptorNativeDescriptor', 'CFFileDescriptorRef', 'CFGregorianDate', 'CFGregorianUnits', 'CFHashCode', 'CFIndex',
+            'CFLocaleRef', 'CFMachPortContext', 'CFMachPortRef', 'CFMessagePortContext', 'CFMessagePortRef', 'CFMutableArrayRef',
+            'CFMutableAttributedStringRef', 'CFMutableBagRef', 'CFMutableBitVectorRef', 'CFMutableCharacterSetRef', 'CFMutableDataRef',
+            'CFMutableDictionaryRef', 'CFMutableSetRef', 'CFMutableStringRef', 'CFNotificationCenterRef', 'CFNullRef',
+            'CFNumberFormatterOptionFlags', 'CFNumberFormatterPadPosition', 'CFNumberFormatterPadPosition.AfterPrefix',
+            'CFNumberFormatterPadPosition.AfterSuffix', 'CFNumberFormatterPadPosition.BeforePrefix',
+            'CFNumberFormatterPadPosition.BeforeSuffix', 'CFNumberFormatterRef', 'CFNumberFormatterStyle',
+            'CFNumberFormatterStyle.CurrencyStyle', 'CFNumberFormatterStyle.DecimalStyle', 'CFNumberFormatterStyle.NoStyle',
+            'CFNumberFormatterStyle.PercentStyle', 'CFNumberFormatterStyle.ScientificStyle', 'CFNumberFormatterStyle.SpellOutStyle',
+            'CFNumberRef', 'CFOptionFlags', 'CFPlugInInstanceRef', 'CFPlugInRef', 'CFPropertyListMutabilityOptions', 'CFPropertyListRef',
+            'CFRange', 'CFReadStreamRef', 'CFRunLoopObserverContext', 'CFRunLoopObserverRef', 'CFRunLoopRef', 'CFRunLoopSourceContext',
+            'CFRunLoopSourceContext1', 'CFRunLoopSourceRef', 'CFRunLoopTimerContext', 'CFRunLoopTimerRef', 'CFSetCallBacks', 'CFSetRef',
+            'CFSocketContext', 'CFSocketNativeHandle', 'CFSocketRef', 'CFSocketSignature', 'CFStreamClientContext', 'CFStreamError',
+            'CFStringCompareFlags', 'CFStringEncoding', 'CFStringEncodings', 'CFStringEncodings.ANSEL', 'CFStringEncodings.Big5',
+            'CFStringEncodings.Big5_E', 'CFStringEncodings.Big5_HKSCS_1999', 'CFStringEncodings.CNS_11643_92_P1',
+            'CFStringEncodings.CNS_11643_92_P2', 'CFStringEncodings.CNS_11643_92_P3', 'CFStringEncodings.DOSArabic',
+            'CFStringEncodings.DOSBalticRim', 'CFStringEncodings.DOSCanadianFrench', 'CFStringEncodings.DOSChineseSimplif',
+            'CFStringEncodings.DOSChineseTrad', 'CFStringEncodings.DOSCyrillic', 'CFStringEncodings.DOSGreek',
+            'CFStringEncodings.DOSGreek1', 'CFStringEncodings.DOSGreek2', 'CFStringEncodings.DOSHebrew', 'CFStringEncodings.DOSIcelandic',
+            'CFStringEncodings.DOSJapanese', 'CFStringEncodings.DOSKorean', 'CFStringEncodings.DOSLatin1', 'CFStringEncodings.DOSLatin2',
+            'CFStringEncodings.DOSLatinUS', 'CFStringEncodings.DOSNordic', 'CFStringEncodings.DOSPortuguese',
+            'CFStringEncodings.DOSRussian', 'CFStringEncodings.DOSThai', 'CFStringEncodings.DOSTurkish', 'CFStringEncodings.EBCDIC_CP037',
+            'CFStringEncodings.EBCDIC_US', 'CFStringEncodings.EUC_CN', 'CFStringEncodings.EUC_JP', 'CFStringEncodings.EUC_KR',
+            'CFStringEncodings.EUC_TW', 'CFStringEncodings.GBK_95', 'CFStringEncodings.GB_18030_2000', 'CFStringEncodings.GB_2312_80',
+            'CFStringEncodings.HZ_GB_2312', 'CFStringEncodings.ISOLatin10', 'CFStringEncodings.ISOLatin2', 'CFStringEncodings.ISOLatin3',
+            'CFStringEncodings.ISOLatin4', 'CFStringEncodings.ISOLatin5', 'CFStringEncodings.ISOLatin6', 'CFStringEncodings.ISOLatin7',
+            'CFStringEncodings.ISOLatin8', 'CFStringEncodings.ISOLatin9', 'CFStringEncodings.ISOLatinArabic',
+            'CFStringEncodings.ISOLatinCyrillic', 'CFStringEncodings.ISOLatinGreek', 'CFStringEncodings.ISOLatinHebrew',
+            'CFStringEncodings.ISOLatinThai', 'CFStringEncodings.ISO_2022_CN', 'CFStringEncodings.ISO_2022_CN_EXT',
+            'CFStringEncodings.ISO_2022_JP', 'CFStringEncodings.ISO_2022_JP_1', 'CFStringEncodings.ISO_2022_JP_2',
+            'CFStringEncodings.ISO_2022_JP_3', 'CFStringEncodings.ISO_2022_KR', 'CFStringEncodings.JIS_C6226_78',
+            'CFStringEncodings.JIS_X0201_76', 'CFStringEncodings.JIS_X0208_83', 'CFStringEncodings.JIS_X0208_90',
+            'CFStringEncodings.JIS_X0212_90', 'CFStringEncodings.KOI8_R', 'CFStringEncodings.KOI8_U', 'CFStringEncodings.KSC_5601_87',
+            'CFStringEncodings.KSC_5601_92_Johab', 'CFStringEncodings.MacArabic', 'CFStringEncodings.MacArmenian',
+            'CFStringEncodings.MacBengali', 'CFStringEncodings.MacBurmese', 'CFStringEncodings.MacCeltic',
+            'CFStringEncodings.MacCentralEurRoman', 'CFStringEncodings.MacChineseSimp', 'CFStringEncodings.MacChineseTrad',
+            'CFStringEncodings.MacCroatian', 'CFStringEncodings.MacCyrillic', 'CFStringEncodings.MacDevanagari',
+            'CFStringEncodings.MacDingbats', 'CFStringEncodings.MacEthiopic', 'CFStringEncodings.MacExtArabic',
+            'CFStringEncodings.MacFarsi', 'CFStringEncodings.MacGaelic', 'CFStringEncodings.MacGeorgian', 'CFStringEncodings.MacGreek',
+            'CFStringEncodings.MacGujarati', 'CFStringEncodings.MacGurmukhi', 'CFStringEncodings.MacHFS', 'CFStringEncodings.MacHebrew',
+            'CFStringEncodings.MacIcelandic', 'CFStringEncodings.MacInuit', 'CFStringEncodings.MacJapanese',
+            'CFStringEncodings.MacKannada', 'CFStringEncodings.MacKhmer', 'CFStringEncodings.MacKorean', 'CFStringEncodings.MacLaotian',
+            'CFStringEncodings.MacMalayalam', 'CFStringEncodings.MacMongolian', 'CFStringEncodings.MacOriya',
+            'CFStringEncodings.MacRomanLatin1', 'CFStringEncodings.MacRomanian', 'CFStringEncodings.MacSinhalese',
+            'CFStringEncodings.MacSymbol', 'CFStringEncodings.MacTamil', 'CFStringEncodings.MacTelugu', 'CFStringEncodings.MacThai',
+            'CFStringEncodings.MacTibetan', 'CFStringEncodings.MacTurkish', 'CFStringEncodings.MacUkrainian', 'CFStringEncodings.MacVT100',
+            'CFStringEncodings.MacVietnamese', 'CFStringEncodings.NextStepJapanese', 'CFStringEncodings.ShiftJIS',
+            'CFStringEncodings.ShiftJIS_X0213', 'CFStringEncodings.ShiftJIS_X0213_MenKuTen', 'CFStringEncodings.UTF7',
+            'CFStringEncodings.UTF7_IMAP', 'CFStringEncodings.VISCII', 'CFStringEncodings.WindowsArabic',
+            'CFStringEncodings.WindowsBalticRim', 'CFStringEncodings.WindowsCyrillic', 'CFStringEncodings.WindowsGreek',
+            'CFStringEncodings.WindowsHebrew', 'CFStringEncodings.WindowsKoreanJohab', 'CFStringEncodings.WindowsLatin2',
+            'CFStringEncodings.WindowsLatin5', 'CFStringEncodings.WindowsVietnamese', 'CFStringInlineBuffer', 'CFStringRef',
+            'CFStringTokenizerRef', 'CFSwappedFloat32', 'CFSwappedFloat64', 'CFTimeInterval', 'CFTimeZoneNameStyle',
+            'CFTimeZoneNameStyle.DaylightSaving', 'CFTimeZoneNameStyle.Generic', 'CFTimeZoneNameStyle.ShortDaylightSaving',
+            'CFTimeZoneNameStyle.ShortGeneric', 'CFTimeZoneNameStyle.ShortStandard', 'CFTimeZoneNameStyle.Standard', 'CFTimeZoneRef',
+            'CFTreeContext', 'CFTreeRef', 'CFTypeID', 'CFTypeRef', 'CFURLBookmarkCreationOptions', 'CFURLBookmarkFileCreationOptions',
+            'CFURLBookmarkResolutionOptions', 'CFURLRef', 'CFUUIDBytes', 'CFUUIDRef', 'CFUserNotificationRef', 'CFWriteStreamRef',
+            'CFXMLAttributeDeclarationInfo', 'CFXMLAttributeListDeclarationInfo', 'CFXMLDocumentInfo', 'CFXMLDocumentTypeInfo',
+            'CFXMLElementInfo', 'CFXMLElementTypeDeclarationInfo', 'CFXMLEntityInfo', 'CFXMLEntityReferenceInfo', 'CFXMLExternalID',
+            'CFXMLNodeRef', 'CFXMLNotationInfo', 'CFXMLParserCallBacks', 'CFXMLParserContext', 'CFXMLParserRef',
+            'CFXMLProcessingInstructionInfo', 'CFXMLTreeRef'
+        ),
+        /*
+        ** Core Graphics Protocols
+        **
+        */
+        11 => array(
+            'CGBitmapContext', 'CGColor', 'CGColorSpace', 'CGContext', 'CGDataConsumer', 'CGDataProvider', 'CGFont', 'CGFunction', 'CGGradient',
+            'CGImage', 'CGLayer', 'CGPath', 'CGPattern', 'CGPDFArray', 'CGPDFContentStream', 'CGPDFContext', 'CGPDFDictionary', 'CGPDFDocument',
+            'CGPDFObject', 'CGPDFOperatorTable', 'CGPDFPage', 'CGPDFScanner', 'CGPDFStream', 'CGPDFString', 'CGShading'
+        ),
+
+        /*
+        ** Core Graphics Data Types
+        **
+        */
+        12 => array(
+            'CGBitmapContextReleaseDataCallback', 'CGColorRef', 'CGColorSpaceRef', 'CGContextRef', 'CGDataConsumerCallbacks',
+            'CGDataConsumerRef', 'CGDataProviderRef', 'CGDataProviderDirectCallbacks', 'CGDataProviderSequentialCallbacks', 'CGFontRef',
+            'CGFontIndex', 'CGGlyph', 'CGFunctionRef', 'CGFunctionCallbacks', 'CGGradientRef', 'CGImageRef', 'CGLayerRef', 'CGPathRef',
+            'CGMutablePathRef', 'CGPathElement', 'CGPatternRef', 'CGPatternCallbacks', 'CGPDFArrayRef', 'CGPDFContentStreamRef',
+            'CGPDFDictionaryRef', 'CGPDFDocumentRef', 'CGPDFObjectRef', 'CGPDFBoolean', 'CGPDFInteger', 'CGPDFReal', 'CGPDFOperatorTableRef',
+            'CGPDFPageRef', 'CGPDFScannerRef', 'CGPDFStreamRef', 'CGPDFStringRef', 'CGShadingRef', 'CGAffineTransform', 'CGFloat', 'CGPoint', 'CGRect',
+            'CGSize', 'CGVector', 'CGError'
+        ),
+        /*
+        ** UIKit Classes
+        **
+        */
+        13 => array(
+            'NSFileProviderExtension', 'NSLayoutConstraint', 'NSLayoutManager', 'NSParagraphStyle', 'NSMutableParagraphStyle',
+            'NSShadow', 'NSStringDrawingContext', 'NSTextAttachment', 'NSTextContainer', 'NSTextTab', 'UIAcceleration', 'UIAccelerometer',
+            'UIAccessibilityCustomAction', 'UIAccessibilityElement', 'UIActivity', 'UIAlertAction', 'UIBarItem', 'UIBarButtonItem',
+            'UITabBarItem', 'UIBezierPath', 'UICollectionViewLayout', 'UICollectionViewFlowLayout', 'UICollectionViewTransitionLayout',
+            'UICollectionViewLayoutAttributes', 'UICollectionViewLayoutInvalidationContext',
+            'UICollectionViewFlowLayoutInvalidationContext', 'UICollectionViewUpdateItem', 'UIColor', 'UIDevice', 'UIDictationPhrase',
+            'UIDocument', 'UIManagedDocument', 'UIDocumentInteractionController', 'UIDynamicAnimator', 'UIDynamicBehavior',
+            'UIAttachmentBehavior', 'UICollisionBehavior', 'UIDynamicItemBehavior', 'UIGravityBehavior', 'UIPushBehavior', 'UISnapBehavior',
+            'UIEvent', 'UIFont', 'UIFontDescriptor', 'UIGestureRecognizer', 'UILongPressGestureRecognizer', 'UIPanGestureRecognizer',
+            'UIScreenEdgePanGestureRecognizer', 'UIPinchGestureRecognizer', 'UIRotationGestureRecognizer', 'UISwipeGestureRecognizer',
+            'UITapGestureRecognizer', 'UIImage', 'UIImageAsset', 'UIKeyCommand', 'UILexicon', 'UILexiconEntry', 'UILocalNotification',
+            'UILocalizedIndexedCollation', 'UIMenuController', 'UIMenuItem', 'UIMotionEffect', 'UIInterpolatingMotionEffect',
+            'UIMotionEffectGroup', 'UINavigationItem', 'UINib', 'UIPasteboard', 'UIPercentDrivenInteractiveTransition', 'UIPopoverController',
+            'UIPresentationController', 'UIPopoverPresentationController', 'UIPrintFormatter', 'UIMarkupTextPrintFormatter',
+            'UISimpleTextPrintFormatter', 'UIViewPrintFormatter', 'UIPrintInfo', 'UIPrintInteractionController', 'UIPrintPageRenderer',
+            'UIPrintPaper', 'UIPrinter', 'UIPrinterPickerController', 'UIResponder', 'UIApplication', 'UIView', 'UIActionSheet',
+            'UIActivityIndicatorView', 'UIAlertView', 'UICollectionReusableView', 'UICollectionViewCell', 'UIControl', 'UIButton',
+            'UIDatePicker', 'UIPageControl', 'UIRefreshControl', 'UISegmentedControl', 'UISlider', 'UIStepper', 'UISwitch', 'UITextField',
+            'UIImageView', 'UIInputView', 'UILabel', 'UINavigationBar', 'UIPickerView', 'UIPopoverBackgroundView', 'UIProgressView',
+            'UIScrollView', 'UICollectionView', 'UITableView', 'UITextView', 'UISearchBar', 'UITabBar', 'UITableViewCell',
+            'UITableViewHeaderFooterView', 'UIToolbar', 'UIVisualEffectView', 'UIWebView', 'UIWindow', 'UIViewController',
+            'UIActivityViewController', 'UIAlertController', 'UICollectionViewController', 'UIDocumentMenuViewController',
+            'UIDocumentPickerExtensionViewController', 'UIDocumentPickerViewController', 'UIInputViewController', 'UINavigationController',
+            'UIImagePickerController', 'UIVideoEditorController', 'UIPageViewController', 'UIReferenceLibraryViewController',
+            'UISearchController', 'UISplitViewController', 'UITabBarController', 'UITableViewController', 'UIScreen', 'UIScreenMode',
+            'UISearchDisplayController', 'UIStoryboard', 'UIStoryboardSegue', 'UIStoryboardPopoverSegue', 'UITableViewRowAction',
+            'UITextChecker', 'UITextInputMode', 'UITextInputStringTokenizer', 'UITextPosition', 'UITextRange', 'UITextSelectionRect', 'UITouch',
+            'UITraitCollection', 'UIUserNotificationAction', 'UIMutableUserNotificationAction', 'UIUserNotificationCategory',
+            'UIMutableUserNotificationCategory', 'UIUserNotificationSettings', 'UIVisualEffect', 'UIBlurEffect', 'UIVibrancyEffect',
+            'NSTextStorage', 'UIActivityItemProvider'
+        ),
+        /*
+        ** UIKit Protocols
+        **
+        */
+        14 => array(
+            'NSLayoutManagerDelegate', 'NSTextAttachmentContainer', 'NSTextLayoutOrientationProvider', 'NSTextStorageDelegate',
+            'UIAccelerometerDelegate', 'UIAccessibility', 'UIAccessibilityAction', 'UIAccessibilityContainer', 'UIAccessibilityFocus',
+            'UIAccessibilityIdentification', 'UIAccessibilityReadingContent', 'UIActionSheetDelegate', 'UIActivityItemSource',
+            'UIAdaptivePresentationControllerDelegate', 'UIAlertViewDelegate', 'UIAppearance', 'UIAppearanceContainer',
+            'UIApplicationDelegate', 'UIBarPositioning', 'UIBarPositioningDelegate', 'UICollectionViewDataSource',
+            'UICollectionViewDelegate', 'UICollectionViewDelegateFlowLayout', 'UICollisionBehaviorDelegate', 'UIContentContainer',
+            'UICoordinateSpace', 'UIDataSourceModelAssociation', 'UIDocumentInteractionControllerDelegate', 'UIDocumentMenuDelegate',
+            'UIDocumentPickerDelegate', 'UIDynamicAnimatorDelegate', 'UIDynamicItem', 'UIGestureRecognizerDelegate',
+            'UIGuidedAccessRestrictionDelegate', 'UIImagePickerControllerDelegate', 'UIInputViewAudioFeedback', 'UIKeyInput',
+            'UILayoutSupport', 'UINavigationBarDelegate', 'UINavigationControllerDelegate', 'UIObjectRestoration',
+            'UIPageViewControllerDataSource', 'UIPageViewControllerDelegate', 'UIPickerViewAccessibilityDelegate',
+            'UIPickerViewDataSource', 'UIPickerViewDelegate', 'UIPopoverBackgroundViewMethods', 'UIPopoverControllerDelegate',
+            'UIPopoverPresentationControllerDelegate', 'UIPrintInteractionControllerDelegate', 'UIPrinterPickerControllerDelegate',
+            'UIResponderStandardEditActions', 'UIScrollViewAccessibilityDelegate', 'UIScrollViewDelegate', 'UISearchBarDelegate',
+            'UISearchControllerDelegate', 'UISearchDisplayDelegate', 'UISearchResultsUpdating', 'UISplitViewControllerDelegate',
+            'UIStateRestoring', 'UITabBarControllerDelegate', 'UITabBarDelegate', 'UITableViewDataSource', 'UITableViewDelegate',
+            'UITextDocumentProxy', 'UITextFieldDelegate', 'UITextInput', 'UITextInputDelegate', 'UITextInputTokenizer', 'UITextInputTraits',
+            'UITextViewDelegate', 'UIToolbarDelegate', 'UITraitEnvironment', 'UIVideoEditorControllerDelegate',
+            'UIViewControllerAnimatedTransitioning', 'UIViewControllerContextTransitioning', 'UIViewControllerInteractiveTransitioning',
+            'UIViewControllerRestoration', 'UIViewControllerTransitionCoordinator', 'UIViewControllerTransitionCoordinatorContext',
+            'UIViewControllerTransitioningDelegate', 'UIWebViewDelegate'
+        ),
+        /*
+        ** AppKit Classes
+        **
+        */
+        15 => array(
+            'NSAccessibilityElement', 'NSAlert', 'NSAnimation', 'NSViewAnimation', 'NSAnimationContext', 'NSAppearance',
+            'NSBezierPath', 'NSCell', 'NSActionCell', 'NSButtonCell', 'NSMenuItemCell', 'NSPopUpButtonCell', 'NSDatePickerCell', 'NSFormCell',
+            'NSLevelIndicatorCell', 'NSPathCell', 'NSSegmentedCell', 'NSSliderCell', 'NSStepperCell', 'NSTextFieldCell', 'NSComboBoxCell',
+            'NSPathComponentCell', 'NSSearchFieldCell', 'NSSecureTextFieldCell', 'NSTableHeaderCell', 'NSTokenFieldCell', 'NSBrowserCell',
+            'NSImageCell', 'NSTextAttachmentCell', 'NSColor', 'NSColorList', 'NSColorPicker', 'NSColorSpace', 'NSController', 'NSObjectController',
+            'NSArrayController', 'NSDictionaryController', 'NSTreeController', 'NSUserDefaultsController', 'NSCursor', 'NSDockTile',
+            'NSDocument', 'NSPersistentDocument', 'NSDocumentController', 'NSDraggingImageComponent', 'NSDraggingItem', 'NSDraggingSession',
+            'NSEvent', 'NSFont', 'NSFontCollection', 'NSMutableFontCollection', 'NSFontDescriptor', 'NSFontManager', 'NSGestureRecognizer',
+            'NSClickGestureRecognizer', 'NSMagnificationGestureRecognizer', 'NSPanGestureRecognizer', 'NSPressGestureRecognizer',
+            'NSRotationGestureRecognizer', 'NSGlyphGenerator', 'NSGlyphInfo', 'NSGradient', 'NSGraphicsContext', 'NSHelpManager', 'NSImage',
+            'NSImageRep', 'NSBitmapImageRep', 'NSCachedImageRep', 'NSCIImageRep', 'NSCustomImageRep', 'NSEPSImageRep', 'NSPDFImageRep',
+            'NSPICTImageRep', 'NSInputManager', 'NSInputServer', 'NSMediaLibraryBrowserController',
+            'NSMenu', 'NSMenuItem', 'NSMovie', 'NSNib', 'NSNibConnector', 'NSNibControlConnector', 'NSNibOutletConnector', 'NSOpenGLContext',
+            'NSOpenGLPixelBuffer', 'NSOpenGLPixelFormat', 'NSPageLayout', 'NSPasteboard',
+            'NSPasteboardItem', 'NSPathControlItem', 'NSPDFInfo', 'NSPDFPanel', 'NSPredicateEditorRowTemplate', 'NSPrinter', 'NSPrintInfo',
+            'NSPrintOperation', 'NSPrintPanel', 'NSResponder', 'NSApplication', 'NSDrawer', 'NSPopover', 'NSView', 'NSBox', 'NSClipView',
+            'NSCollectionView', 'NSControl', 'NSBrowser', 'NSButton', 'NSPopUpButton', 'NSStatusBarButton', 'NSColorWell', 'NSDatePicker',
+            'NSImageView', 'NSLevelIndicator', 'NSMatrix', 'NSForm', 'NSPathControl', 'NSRuleEditor', 'NSPredicateEditor', 'NSScroller',
+            'NSSegmentedControl', 'NSSlider', 'NSStepper', 'NSTableView', 'NSOutlineView', 'NSTextField', 'NSComboBox', 'NSSearchField',
+            'NSSecureTextField', 'NSTokenField', 'NSMenuView', 'NSMovieView', 'NSOpenGLView', 'NSProgressIndicator', 'NSQuickDrawView',
+            'NSRulerView', 'NSScrollView', 'NSSplitView', 'NSStackView', 'NSTableCellView', 'NSTableHeaderView', 'NSTableRowView', 'NSTabView',
+            'NSText', 'NSTextView', 'NSVisualEffectView', 'NSViewController', 'NSCollectionViewItem', 'NSPageController',
+            'NSSplitViewController', 'NSTabViewController', 'NSTitlebarAccessoryViewController', 'NSWindow', 'NSPanel', 'NSColorPanel',
+            'NSFontPanel', 'NSSavePanel', 'NSOpenPanel', 'NSWindowController', 'NSRulerMarker', 'NSRunningApplication', 'NSScreen',
+            'NSSharingService', 'NSSharingServicePicker', 'NSSound', 'NSSpeechRecognizer', 'NSSpeechSynthesizer', 'NSSpellChecker',
+            'NSSplitViewItem', 'NSStatusBar', 'NSStatusItem', 'NSStoryboard', 'NSStoryboardSegue', 'NSTableColumn', 'NSTabViewItem',
+            'NSTextAlternatives', 'NSTextBlock', 'NSTextTable', 'NSTextTableBlock', 'NSTextFinder',
+            'NSTextInputContext', 'NSTextList', 'NSToolbar', 'NSToolbarItem', 'NSToolbarItemGroup', 'NSTouch', 'NSTrackingArea',
+            'NSTreeNode', 'NSTypesetter', 'NSATSTypesetter', 'NSWorkspace', 'CAOpenGLLayer',
+            'NSOpenGLLayer'
+        ),
+        /*
+        ** AppKit Protocols
+        **
+        */
+        16 => array(
+            'NSAccessibility', 'NSAccessibility Informal', 'NSAccessibilityButton', 'NSAccessibilityCheckBox',
+            'NSAccessibilityContainsTransientUI', 'NSAccessibilityGroup', 'NSAccessibilityImage',
+            'NSAccessibilityLayoutArea', 'NSAccessibilityLayoutItem', 'NSAccessibilityList', 'NSAccessibilityNavigableStaticText',
+            'NSAccessibilityOutline', 'NSAccessibilityProgressIndicator', 'NSAccessibilityRadioButton', 'NSAccessibilityRow',
+            'NSAccessibilitySlider', 'NSAccessibilityStaticText', 'NSAccessibilityStepper', 'NSAccessibilitySwitch', 'NSAccessibilityTable',
+            'NSAlertDelegate', 'NSAnimatablePropertyContainer', 'NSAnimationDelegate', 'NSAppearanceCustomization', 'NSApplicationDelegate',
+            'NSBrowserDelegate', 'NSChangeSpelling', 'NSCollectionViewDelegate', 'NSColorPickingCustom', 'NSColorPickingDefault',
+            'NSComboBoxCellDataSource', 'NSComboBoxDataSource', 'NSComboBoxDelegate', 'NSControlTextEditingDelegate',
+            'NSDatePickerCellDelegate', 'NSDictionaryControllerKeyValuePair', 'NSDraggingDestination', 'NSDraggingInfo', 'NSDraggingSource',
+            'NSDrawerDelegate', 'NSEditor', 'NSEditorRegistration', 'NSFontPanelValidation', 'NSGestureRecognizerDelegate', 'NSGlyphStorage',
+            'NSIgnoreMisspelledWords', 'NSImageDelegate', 'NSKeyValueBindingCreation', 'NSLayerDelegateContentsScaleUpdating',
+            'NSMatrixDelegate', 'NSMenuDelegate', 'NSMenuValidation', 'NSNibAwaking', 'NSOpenSavePanelDelegate',
+            'NSOutlineViewDataSource', 'NSOutlineViewDelegate', 'NSPageControllerDelegate', 'NSPasteboardItemDataProvider',
+            'NSPasteboardReading', 'NSPasteboardWriting', 'NSPathCellDelegate', 'NSPathControlDelegate', 'NSPlaceholders', 'NSPopoverDelegate',
+            'NSPrintPanelAccessorizing', 'NSRuleEditorDelegate', 'NSSeguePerforming', 'NSServicesMenuRequestor', 'NSSharingServiceDelegate',
+            'NSSharingServicePickerDelegate', 'NSSoundDelegate', 'NSSpeechRecognizerDelegate', 'NSSpeechSynthesizerDelegate',
+            'NSSplitViewDelegate', 'NSStackViewDelegate', 'NSTabViewDelegate', 'NSTableViewDataSource', 'NSTableViewDelegate',
+            'NSTextDelegate', 'NSTextFieldDelegate', 'NSTextFinderBarContainer', 'NSTextFinderClient', 'NSTextInput',
+            'NSTextInputClient', 'NSTextViewDelegate',
+            'NSTokenFieldCellDelegate', 'NSTokenFieldDelegate', 'NSToolTipOwner', 'NSToolbarDelegate', 'NSToolbarItemValidation',
+            'NSUserInterfaceItemIdentification', 'NSUserInterfaceItemSearchDataSource', 'NSUserInterfaceItemSearching',
+            'NSUserInterfaceValidations', 'NSValidatedUserInterfaceItem', 'NSViewControllerPresentationAnimator', 'NSWindowDelegate',
+            'NSWindowRestoration', 'NSWindowScripting'
+        )
+    ),
+    'SYMBOLS' => array(
+        # Operators
+        1 => array(
+            '!=', '!==', '%', '%=', '&', '&&', '&*', '&+', '&-', '&=', '*', '*=', '+', '++', '+=', '-', '--', '-=', '...', '..<', '/',
+            '/=', '<', '<<', '<<=', '<=', '==', '===', '>', '>=', '>>', '>>=', '??', '^', '^=', '|', '|=', '||', '~=', '~>', '!', '~'
+        ),
+        # Structure
+        2 => array(
+            '(', ')', '[', ']', '{', '}', ',', ';', ':'
+        )
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        11 => true,
+        12 => true,
+        13 => true,
+        14 => true,
+        15 => true,
+        16 => true,
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #B833A1;',                        // Keywords
+            2 => 'color: #B833A1;',                        // Attributes
+            3 => 'color: #508187;',                        // Builtin Functions
+            4 => 'color: #6F41A7;',                        // Types
+            5 => 'color: #6F41A7;',
+            6 => 'color: #6F41A7;',
+            7 => 'color: #6F41A7;',
+            8 => 'color: #6F41A7;',
+            9 => 'color: #6F41A7;',
+            10 => 'color: #6F41A7;',
+            11 => 'color: #6F41A7;',
+            12 => 'color: #6F41A7;',
+            13 => 'color: #6F41A7;',
+            14 => 'color: #6F41A7;',
+            15 => 'color: #6F41A7;',
+            16 => 'color: #6F41A7;'
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #008312;',
+            'MULTI' => 'color: #008312;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #C41A16;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #C41A16;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #1C00CF;',
+            1 => 'color: #1C00CF;',
+            2 => 'color: #1C00CF;',
+            3 => 'color: #1C00CF;',
+        ),
+        'METHODS' => array(
+            1 => 'color: #508187;'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: black;'
+        ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+    ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+    ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+    ),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/htdocs/application/libraries/geshi/geshi/systemverilog.php b/htdocs/application/libraries/geshi/geshi/systemverilog.php
index 125b8c1..24ed343 100644
--- a/htdocs/application/libraries/geshi/geshi/systemverilog.php
+++ b/htdocs/application/libraries/geshi/geshi/systemverilog.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Sean O'Boyle
  * Copyright: (C) 2008 IntelligentDV
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/06/25
  *
  * SystemVerilog IEEE 1800-2009(draft8) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/tcl.php b/htdocs/application/libraries/geshi/geshi/tcl.php
index 697411f..73b854e 100644
--- a/htdocs/application/libraries/geshi/geshi/tcl.php
+++ b/htdocs/application/libraries/geshi/geshi/tcl.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Reid van Melle (rvanmelle@gmail.com)
  * Copyright: (c) 2004 Reid van Melle (sorry@nowhere)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/05/05
  *
  * TCL/iTCL language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/tclegg.php b/htdocs/application/libraries/geshi/geshi/tclegg.php
new file mode 100644
index 0000000..cc787e8
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/tclegg.php
@@ -0,0 +1,501 @@
+<?php
+/*************************************************************************************
+ * tclegg.php
+ * ---------------------------------
+ * Author: Reid van Melle (rvanmelle@gmail.com)
+ * Copyright: (c) 2004 Reid van Melle (sorry@nowhere)
+ * Release Version: 1.0.9.0
+ * Date Started: 2006/05/05
+ *
+ * TCL/iTCL language file for GeSHi.
+ *
+ * This was thrown together in about an hour so I don't expect
+ * really great things.  However, it is a good start.  I never
+ * got a change to try out the iTCL or object-based support but
+ * this is not widely used anyway.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2006/05/05 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/05/05)
+ * -------------------------
+ * - Get TCL built-in special variables highlighted with a new color..
+ *   currently, these are listed in //special variables in the keywords
+ *   section, but they get covered by the general REGEXP for symbols
+ * - General cleanup, testing, and verification
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'TCLEGG',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => '/(?<!\\\\)#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //2 => '/{[^}\n]+}/'
+    ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*
+         * Set 1: reserved words
+         * http://python.org/doc/current/ref/keywords.html
+         */
+        1 => array(
+            'break',
+            'case',
+            'catch',
+            'continue',
+            'default',
+            'else',
+            'elseif',
+            'error',
+            'eval',
+            'exit',
+            'expr',
+            'for',
+            'for_array_keys',
+            'for_file',
+            'for_recursive_glob',
+            'foreach',
+            'global',
+            'if',
+            'in',
+            'itcl_class',
+            'loop',
+            'method',
+            'namespace',
+            'proc',
+            'protected',
+            'public',
+            'rename',
+            'return',
+            'set',
+            'switch',
+            'then',
+            'unwind_protect',
+            'uplevel',
+            'upvar',
+            'variable',
+            'while',
+        ),
+
+        /*
+         * Set 2: builtins
+         * http://asps.activatestate.com/ASPN/docs/ActiveTcl/8.4/tcl/tcl_2_contents.htm
+         */
+        2 => array(
+            // string handling
+            'append', 'binary', 'format', 're_syntax', 'regexp', 'regsub',
+            'scan', 'string', 'subst',
+            // list handling
+            'concat', 'join', 'lappend', 'lindex', 'list', 'llength', 'lrange',
+            'lreplace', 'lsearch', 'lset', 'lsort', 'split',
+            // procedures and output
+            'incr', 'close', 'eof', 'fblocked', 'fconfigure', 'fcopy', 'file',
+            'fileevent', 'flush', 'gets', 'open', 'puts', 'read', 'seek',
+            'socket', 'tell',
+            // packages and source files
+            'load', 'loadTk', 'package', 'pgk::create', 'pgk_mkIndex', 'source',
+            // interpreter routines
+            'bgerror', 'history', 'info', 'interp', 'memory', 'unknown',
+            // library routines
+            'enconding', 'http', 'msgcat',
+            // system related
+            'cd', 'clock', 'exec', 'glob', 'pid', 'pwd', 'time',
+            // platform specified
+            'dde', 'registry', 'resource',
+            // special variables
+            '$argc', '$argv', '$errorCode', '$errorInfo', '$argv0',
+            '$auto_index', '$auto_oldpath', '$auto_path', '$env',
+            '$tcl_interactive', '$tcl_libpath', '$tcl_library',
+            '$tcl_pkgPath', '$tcl_platform', '$tcl_precision', '$tcl_traceExec',
+        ),
+
+        /*
+         * Set 3: standard library
+         * Replaced by binds
+         */
+        3 => array(
+            //'comment', 'filename', 'library', 'packagens', 'tcltest', 'tclvars',
+            'act',
+            'away',
+            'bcst',
+            'bot',
+            'chat',
+            'chjn',
+            'chof',
+            'chon',
+            'chpt',
+            'cron',
+            'ctcp',
+            'ctcr',
+            'dcc',
+            'disc',
+            'evnt',
+            'fil',
+            'filt',
+            'flud',
+            'kick',
+            'link',
+            'log',
+            'lost',
+            'mode',
+            'msg',
+            'msgm',
+            'need',
+            'nick',
+            'nkch',
+            'notc',
+            'note',
+            'out',
+            'part',
+            'pub',
+            'pubm',
+            'raw',
+            'rcvd',
+            'rejn',
+            'sent',
+            'sign',
+            'splt',
+            'topc',
+            'tout',
+            'unld',
+            'wall',
+        ),
+
+        /*
+         * Set 4: tcl-commands (eggdrop dedicated)
+         */
+        4 => array(
+            'addbot',
+            'addchanrec',
+            'adduser',
+            'assoc',
+
+            'backup',
+            'banlist',
+            'bind',
+            'binds',
+            'boot',
+            'botattr',
+            'botishalfop',
+            'botisop',
+            'botisvoice',
+            'botlist',
+            'botonchan',
+            'bots',
+
+            'callevent',
+            'chanbans',
+            'chanexempts',
+            'chaninvites',
+            'chanlist',
+            'channel',
+            'channels',
+            'chansettype',
+            'chattr',
+            'chhandle',
+            'clearqueue',
+            'compressfile',
+            'connect',
+            'console',
+            'control',
+            'countusers',
+            'cp',
+            'ctime',
+
+            'dccbroadcast',
+            'dccdumpfile',
+            'dcclist',
+            'dccputchan',
+            'dccsend',
+            'dccsimul',
+            'dccused',
+            'decrypt',
+            'delchanrec',
+            'delhost',
+            'deludef',
+            'deluser',
+            'die',
+            'dnslookup',
+            'dumpfile',
+            'duration',
+
+            'echo',
+            'encpass',
+            'encrypt',
+            'erasenotes',
+            'exemptlist',
+
+            'filesend',
+            'finduser',
+            'flushmode',
+
+            'getchan',
+            'getchanhost',
+            'getchanidle',
+            'getchaninfo',
+            'getchanjoin',
+            'getchanmode',
+            'getdccaway',
+            'getdccidle',
+            'getdesc',
+            'getdirs',
+            'getfileq',
+            'getfiles',
+            'getfilesendtime',
+            'getflags',
+            'getlink',
+            'getowner',
+            'getpwd',
+            'getting',
+            'getudefs',
+            'getuser',
+
+            'hand',
+            'handonchan',
+
+            'idx',
+            'ignorelist',
+            'invitelist',
+            'isban',
+            'isbansticky',
+            'isbotnick',
+            'ischanban',
+            'ischanexempt',
+            'ischaninvite',
+            'ischanjuped',
+            'iscompressed',
+            'isdynamic',
+            'isexempt',
+            'isexemptsticky',
+            'ishalfop',
+            'isignore',
+            'isinvite',
+            'isinvitesticky',
+            'islinked',
+            'isop',
+            'ispermban',
+            'ispermexempt',
+            'isperminvite',
+            'isvoice',
+
+            'jump',
+
+            'killassoc',
+            'killban',
+            'killchanban',
+            'killchanexempt',
+            'killchaninvite',
+            'killdcc',
+            'killexempt',
+            'killignore',
+            'killinvite',
+            'killtimer',
+            'killutimer',
+
+            'listen',
+            'listnotes',
+            'loadchannels',
+            'loadhelp',
+            'loadmodule',
+            'logfile',
+
+            'maskhost',
+            'matchaddr',
+            'matchattr',
+            'matchban',
+            'matchcidr',
+            'matchexempt',
+            'matchinvite',
+            'matchstr',
+            'md',
+            'mkdir',
+            'modules',
+            'mv',
+            'myip',
+
+            'newban',
+            'newchanban',
+            'newchanexempt',
+            'newchaninvite',
+            'newexempt',
+            'newignore',
+            'newinvite',
+            'notes',
+
+            'onchan',
+            'onchansplit',
+
+            'passwdok',
+            'pushmode',
+            'putallbots',
+            'putbot',
+            'putcmdlog',
+            'putdcc',
+            'puthelp',
+            'putkick',
+            'putlog',
+            'putloglev',
+            'putnow',
+            'putquick',
+            'putserv',
+            'putxferlog',
+
+            'queuesize',
+
+            'rand',
+            'rehash',
+            'reload',
+            'reloadhelp',
+            'renudef',
+            'resetbans',
+            'resetchan',
+            'resetchanidle',
+            'resetchanjoin',
+            'resetexempts',
+            'resetinvites',
+            'restart',
+            'rmdir',
+
+            'save',
+            'savechannels',
+            'sendnote',
+            'setchan',
+            'setchaninfo',
+            'setdccaway',
+            'setdesc',
+            'setflags',
+            'setlink',
+            'setowner',
+            'setpwd',
+            'setudef',
+            'setuser',
+            'stickban',
+            'stickexempt',
+            'stickinvite',
+            'storenote',
+            'strftime',
+            'strip',
+            'stripcodes',
+
+            'timer',
+            'timers',
+            'topic',
+            'traffic',
+
+            'unames',
+            'unbind',
+            'uncompressfile',
+            'unixtime',
+            'unlink',
+            'unloadhelp',
+            'unloadmodule',
+            'unstickban',
+            'unstickexempt',
+            'unstickinvite',
+            'userlist',
+            'utimer',
+            'utimers',
+
+            'validchan',
+            'valididx',
+            'validuser',
+
+            'washalfop',
+            'wasop',
+            'whom',
+        )
+    ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '$', '*', '&', '%', '!', ';', '<', '>', '?'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
+            2 => 'color: #008000;',                        // Built-ins + self
+            3 => 'color: #dc143c;',                        // Standard lib
+            4 => 'color: #0000cd;'                        // Special methods
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #483d8b;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+        ),
+        'METHODS' => array(
+            1 => 'color: black;'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #ff3333;'
+        ),
+        'SCRIPT' => array()
+    ),
+    'URLS' => array(
+        1 => 'http://wiki.tcl.tk/{FNAMEL}',
+        2 => 'http://wiki.tcl.tk/{FNAMEUF}',
+        3 => 'http://wiki.eggdrop.fr/Binds#{FNAMEU}',
+        4 => 'http://wiki.eggdrop.fr/{FNAMEUF}'
+    ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+    ),
+    'REGEXPS' => array(
+        //Special variables
+        0 => '[\\$]+[a-zA-Z_][a-zA-Z0-9_]*',
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '\\'
+        )
+    )
+);
diff --git a/htdocs/application/libraries/geshi/geshi/teraterm.php b/htdocs/application/libraries/geshi/geshi/teraterm.php
index 2a4b412..7c36002 100644
--- a/htdocs/application/libraries/geshi/geshi/teraterm.php
+++ b/htdocs/application/libraries/geshi/geshi/teraterm.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Boris Maisuradze (boris at logmett.com)
  * Copyright: (c) 2008 Boris Maisuradze (http://logmett.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/09/26
  *
  * Tera Term Macro language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/texgraph.php b/htdocs/application/libraries/geshi/geshi/texgraph.php
new file mode 100644
index 0000000..ed57955
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/texgraph.php
@@ -0,0 +1,1137 @@
+<?php
+/*************************************************************************************
+ * texgraph.php
+ * -----------
+ * Author: Patrick Fradin (patrick.fradin@gmail.com)
+ * Copyright: (c) 2011 Patrick Fradin
+ * Release Version: 1.0.9.0
+ * Date Started: 2011-09-18
+ *
+ * TeXgraph language file for GeSHi.
+ *
+ * http://texgraph.tuxfamily.org/
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'TeXgraph',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(
+        '{'=>'}'
+    ),
+    'COMMENT_REGEXP' => array(
+    ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array( //file construction
+            'TeXgraph', 'Cmd', 'Var', 'Mac', 'Graph', 'Include'
+        ),
+        2 => array( //programmation structure
+            'if', 'else', 'elif',  'fi',
+            'for', 'do', 'od', 'by', 'By',
+            'step', 'until', 'in', 'to', 'repeat', 'from', 'odfi', 'andif',
+            'And', 'Or', 'CutA', 'CutB', 'Inside', 'Inter', 'InterL'
+        ),
+        3 => array( // commandes prédéfinies
+            'Aretes',
+            'Arg',
+            'Args',
+            'Assign',
+            'Axes',
+            'Bezier',
+            'Bord',
+            'Border',
+            'Build3D',
+            'Cartesienne',
+            'ChangeAttr',
+            'Clip2D',
+            'Clip3DLine',
+            'ClipFacet',
+            'Close',
+            'CloseFile',
+            'ComposeMatrix',
+            'ComposeMatrix3D',
+            'Concat',
+            'ConvertToObj',
+            'ConvertToObjN',
+            'Copy',
+            'Courbe',
+            'Creer',
+            'DefMac',
+            'DefVar',
+            'DefaultAttr',
+            'Del',
+            'DelGraph',
+            'DelMac',
+            'DelVar',
+            'Der',
+            'Diff',
+            'Display3D',
+            'DistCam',
+            'Droite',
+            'Dup',
+            'Echange',
+            'Ellipse',
+            'EllipticArc',
+            'Ent',
+            'EpsCoord',
+            'EquaDif',
+            'Eval',
+            'Exec',
+            'Export',
+            'ExportObject',
+            'ExportPathData',
+            'Fenetre',
+            'FileExists',
+            'For',
+            'Free',
+            'Fvisible',
+            'Get',
+            'Get3D',
+            'GetAttr',
+            'GetMatrix',
+            'GetMatrix3D',
+            'GetSpline',
+            'GetStr',
+            'GetSurface',
+            'GrayScale',
+            'Grille',
+            'HexaColor',
+            'IdMatrix',
+            'IdMatrix3D',
+            'Im',
+            'Implicit',
+            'Inc',
+            'Input',
+            'InputMac',
+            'Inserer3D',
+            'Insert',
+            'Int',
+            'IsMac',
+            'IsString',
+            'IsVar',
+            'Label',
+            'Ligne',
+            'Liste',
+            'Load',
+            'LoadImage',
+            'Loop',
+            'LowerCase',
+            'M',
+            'MakePoly',
+            'Map',
+            'Marges',
+            'Merge',
+            'Message',
+            'Mix',
+            'ModelView',
+            'Mtransform',
+            'Mtransform3D',
+            'MyExport',
+            'Nargs',
+            'NewGraph',
+            'NewMac',
+            'NewVar',
+            'Nops',
+            'Norm',
+            'Normal',
+            'OpenFile',
+            'OriginalCoord',
+            'PaintFacet',
+            'PaintVertex',
+            'Path',
+            'PermuteWith',
+            'Point',
+            'Polaire',
+            'PosCam',
+            'Prodscal',
+            'Prodvec',
+            'Proj3D',
+            'Rand',
+            'Re',
+            'ReCalc',
+            'ReadData',
+            'ReadFlatPs',
+            'ReadObj',
+            'RenCommand',
+            'RenMac',
+            'RestoreAttr',
+            'Reverse',
+            'Rgb',
+            'Round',
+            'Saut',
+            'SaveAttr',
+            'ScientificF',
+            'Seq',
+            'Set',
+            'SetAttr',
+            'SetMatrix',
+            'SetMatrix3D',
+            'Si',
+            'Solve',
+            'Sommets',
+            'Sort',
+            'SortFacet',
+            'Special',
+            'Spline',
+            'Str',
+            'StrArgs',
+            'StrComp',
+            'StrCopy',
+            'StrDel',
+            'StrEval',
+            'StrLength',
+            'StrPos',
+            'StrReplace',
+            'String',
+            'TeX2FlatPs',
+            'UpperCase',
+            'While',
+            'WriteFile',
+            'abs',
+            'arccos',
+            'arccot',
+            'arcsin',
+            'arctan',
+            'argch',
+            'argcth',
+            'argsh',
+            'argth',
+            'bar',
+            'ch',
+            'cos',
+            'cot',
+            'cth',
+            'draw',
+            'opp',
+            'sh',
+            'sin',
+            'sqr',
+            'sqrt',
+            'tan',
+            'th',
+        ),
+        4 => array( //commandes relatives à l'interface graphique
+            'AddMenu2D',
+            'AddMenu3D',
+            'Attributs',
+            'DelBitmap',
+            'DelButton',
+            'DelItem',
+            'DelText',
+            'Delay',
+            'Hide',
+            'ListFiles',
+            'ListWords',
+            'MaxPixels',
+            'Move',
+            'NewBitmap',
+            'NewButton',
+            'NewItem',
+            'NewText',
+            'NotXor',
+            'Pixel',
+            'Pixel2Scr',
+            'ReDraw',
+            'Scr2Pixel',
+            'Show',
+            'Stroke',
+            'Timer',
+            'TimerMac',
+            'UpdateLocalDatabase',
+            'VisibleGraph',
+        ),
+        5 => array( //constantes prédéfinies
+            'Data',
+            'Diese',
+            'DirSep',
+            'DocPath',
+            'ExportMode',
+            'GUI',
+            'Huge',
+            'ImageViewer',
+            'InitialPath',
+            'JavaviewPath',
+            'LARGE',
+            'LF',
+            'Large',
+            'Nil',
+            'PdfReader',
+            'Thicklines',
+            'TmpPath',
+            'UserMacPath',
+            'WebLoad',
+            'Windows',
+            'Xmax',
+            'Xmin',
+            'Xscale',
+            'Ymax',
+            'Ymin',
+            'Yscale',
+            'aliceblue',
+            'antiquewhite',
+            'aqua',
+            'aquamarine',
+            'asterisk',
+            'azure',
+            'baseline',
+            'bdiag',
+            'beige',
+            'bevel',
+            'bezier',
+            'bigdot',
+            'bisque',
+            'black',
+            'blanchedalmond',
+            'blue',
+            'blueviolet',
+            'bmp',
+            'bottom',
+            'brown',
+            'burlywood',
+            'butt',
+            'cadetblue',
+            'center',
+            'centered',
+            'central',
+            'chartreuse',
+            'chocolate',
+            'circle',
+            'closepath',
+            'comp',
+            'coral',
+            'cornflowerblue',
+            'cornsilk',
+            'crimson',
+            'cross',
+            'curve',
+            'cyan',
+            'darkblue',
+            'darkcyan',
+            'darkgoldenrod',
+            'darkgray',
+            'darkgreen',
+            'darkkhaki',
+            'darkmagenta',
+            'darkolivegreen',
+            'darkorange',
+            'darkorchid',
+            'darkred',
+            'darksalmon',
+            'darkseagreen',
+            'darkslateblue',
+            'darkslategray',
+            'darkturquoise',
+            'darkviolet',
+            'dashed',
+            'deeppink',
+            'deepskyblue',
+            'diagcross',
+            'diamond',
+            'dimgray',
+            'dodgerblue',
+            'dot',
+            'dotcircle',
+            'dotted',
+            'e',
+            'ellipse',
+            'ellipticArc',
+            'eps',
+            'epsc',
+            'fdiag',
+            'firebrick',
+            'floralwhite',
+            'footnotesize',
+            'forestgreen',
+            'framed',
+            'fuchsia',
+            'full',
+            'gainsboro',
+            'geom',
+            'ghostwhite',
+            'gold',
+            'goldenrod',
+            'gray',
+            'green',
+            'greenyellow',
+            'honeydew',
+            'horizontal',
+            'hotpink',
+            'huge',
+            'hvcross',
+            'i',
+            'indianred',
+            'indigo',
+            'ivory',
+            'jump',
+            'jvx',
+            'khaki',
+            'large',
+            'lavender',
+            'lavenderblush',
+            'lawngreen',
+            'left',
+            'lemonchiffon',
+            'lightblue',
+            'lightcoral',
+            'lightcyan',
+            'lightgoldenrodyellow',
+            'lightgray',
+            'lightgreen',
+            'lightpink',
+            'lightsalmon',
+            'lightseagreen',
+            'lightskyblue',
+            'lightslategray',
+            'lightsteelblue',
+            'lightyellow',
+            'lime',
+            'limegreen',
+            'line',
+            'linearc',
+            'linen',
+            'magenta',
+            'margeB',
+            'margeD',
+            'margeG',
+            'margeH',
+            'maroon',
+            'mediumaquamarine',
+            'mediumblue',
+            'mediumorchid',
+            'mediumpurple',
+            'mediumseagreen',
+            'mediumslateblue',
+            'mediumspringgreen',
+            'mediumturquoise',
+            'mediumvioletred',
+            'midnightblue',
+            'mintcream',
+            'mistyrose',
+            'miter',
+            'moccasin',
+            'move',
+            'navajowhite',
+            'navy',
+            'noline',
+            'none',
+            'normalsize',
+            'obj',
+            'oldlace',
+            'olive',
+            'olivedrab',
+            'oplus',
+            'orange',
+            'orangered',
+            'orchid',
+            'ortho',
+            'otimes',
+            'palegoldenrod',
+            'palegreen',
+            'paleturquoise',
+            'palevioletred',
+            'papayawhip',
+            'pdf',
+            'pdfc',
+            'peachpuff',
+            'pentagon',
+            'peru',
+            'pgf',
+            'pi',
+            'pink',
+            'plum',
+            'plus',
+            'powderblue',
+            'psf',
+            'pst',
+            'purple',
+            'red',
+            'right',
+            'rosybrown',
+            'round',
+            'royalblue',
+            'saddlebrown',
+            'salmon',
+            'sandybrown',
+            'scriptsize',
+            'seagreen',
+            'seashell',
+            'sep',
+            'sep3D',
+            'sienna',
+            'silver',
+            'skyblue',
+            'slateblue',
+            'slategray',
+            'small',
+            'snow',
+            'solid',
+            'special',
+            'springgreen',
+            'square',
+            'src4latex',
+            'stacked',
+            'steelblue',
+            'svg',
+            'teal',
+            'teg',
+            'tex',
+            'texsrc',
+            'thicklines',
+            'thinlines',
+            'thistle',
+            'times',
+            'tiny',
+            'tkz',
+            'tomato',
+            'top',
+            'triangle',
+            'turquoise',
+            'user',
+            'userdash',
+            'version',
+            'vertical',
+            'violet',
+            'wheat',
+            'white',
+            'whitesmoke',
+            'yellow',
+            'yellowgreen',
+        ),
+        6 => array( //macros prédéfinies
+            'Abs',
+            'Anp',
+            'Apercu',
+            'Arc',
+            'Arc3D',
+            'AretesNum',
+            'AxeX3D',
+            'AxeY3D',
+            'AxeZ3D',
+            'Axes3D',
+            'Bcolor',
+            'Bouton',
+            'BoxAxes3D',
+            'BrightColor',
+            'Bsave',
+            'Ceil',
+            'Cercle',
+            'Cercle3D',
+            'Chanfrein',
+            'ChangeWinTo',
+            'Clip',
+            'Clip3D',
+            'ColorJump',
+            'CompVer',
+            'CompileEps',
+            'CompilePdf',
+            'Cone',
+            'Courbe3D',
+            'CpCopy',
+            'CpDel',
+            'CpNops',
+            'CpReplace',
+            'CpReverse',
+            'CplColor',
+            'Cvx2d',
+            'Cvx3d',
+            'Cvx3dAux',
+            'Cylindre',
+            'Dark',
+            'Dbissec',
+            'Dcarre',
+            'Dcone',
+            'Dcylindre',
+            'Ddroite',
+            'Dmed',
+            'Dparallel',
+            'Dparallelep',
+            'Dparallelo',
+            'Dperp',
+            'Dpolyreg',
+            'DpqGoneReg',
+            'DpqGoneReg3D',
+            'Dprisme',
+            'Dpyramide',
+            'DrawAretes',
+            'DrawDdroite',
+            'DrawDot',
+            'DrawDroite',
+            'DrawFaces',
+            'DrawFacet',
+            'DrawFlatFacet',
+            'DrawGouraudTr',
+            'DrawPlan',
+            'DrawPoly',
+            'DrawPolyNC',
+            'DrawSmoothFacet',
+            'Drectangle',
+            'Dsphere',
+            'Dsurface',
+            'Dtetraedre',
+            'Esave',
+            'ExportGouraudTr',
+            'ExportSmoothFacet',
+            'FacesNum',
+            'Gcolor',
+            'GradDroite',
+            'HollowFacet',
+            'Hsb',
+            'HueColor',
+            'Incfrac',
+            'Intersec',
+            'Intersection',
+            'IsAlign',
+            'IsAlign3d',
+            'IsIn',
+            'IsPlan',
+            'KillDup',
+            'KillDup3D',
+            'LabelArc',
+            'LabelAxe',
+            'LabelDot',
+            'LabelDot3D',
+            'LabelSeg',
+            'Lcolor',
+            'Light',
+            'Ligne3D',
+            'MakeVer',
+            'Map3D',
+            'MapBy',
+            'Merge3d',
+            'MixColor',
+            'MouseZoom',
+            'NewLabel',
+            'NewLabelDot',
+            'NewLabelDot3D',
+            'NewTeXlabel',
+            'Nops3d',
+            'Ordonner',
+            'Palette',
+            'Parallelep',
+            'Point3D',
+            'Pos',
+            'Pos3d',
+            'Prisme',
+            'Pyramide',
+            'Rarc',
+            'Rcercle',
+            'Rcolor',
+            'RealArg',
+            'RealCoord',
+            'RealCoordV',
+            'Rellipse',
+            'RellipticArc',
+            'RestoreTphi',
+            'RestoreWin',
+            'RestoreWin3d',
+            'Rgb2Gray',
+            'Rgb2Hexa',
+            'Rgb2Hsb',
+            'RgbL',
+            'Ryb',
+            'SatColor',
+            'SaveTphi',
+            'SaveWin',
+            'SaveWin3d',
+            'SceneToGeom',
+            'SceneToJvx',
+            'SceneToObj',
+            'ScrCoord',
+            'ScrCoordV',
+            'ScreenCenter',
+            'ScreenPos',
+            'ScreenX',
+            'ScreenY',
+            'Section',
+            'Section2',
+            'Seg',
+            'SetStr',
+            'Snapshot',
+            'SortWith',
+            'Sphere',
+            'StrListAdd',
+            'StrListCopy',
+            'StrListDelKey',
+            'StrListDelVal',
+            'StrListGetKey',
+            'StrListInit',
+            'StrListInsert',
+            'StrListKill',
+            'StrListReplace',
+            'StrListReplaceKey',
+            'StrListShow',
+            'StrNum',
+            'SvgCoord',
+            'TeXCoord',
+            'Tetra',
+            'VarGlob',
+            'WriteObj',
+            'WriteOff',
+            'Xde',
+            'Yde',
+            'Zde',
+            'addfrac',
+            'affin',
+            'aire3d',
+            'angle',
+            'angle3d',
+            'angleD',
+            'antirot3d',
+            'arc',
+            'arcBezier',
+            'axeX',
+            'axeY',
+            'axes',
+            'background',
+            'bande',
+            'bary',
+            'bary3d',
+            'bbox',
+            'bdAngleD',
+            'bdArc',
+            'bdAxes',
+            'bdCercle',
+            'bdCone',
+            'bdCurve',
+            'bdCylinder',
+            'bdDot',
+            'bdDroite',
+            'bdFacet',
+            'bdLabel',
+            'bdLine',
+            'bdPlan',
+            'bdPlanEqn',
+            'bdPrism',
+            'bdPyramid',
+            'bdSphere',
+            'bdSurf',
+            'bdTorus',
+            'bdWall',
+            'binom',
+            'bissec',
+            'bordsAjour',
+            'cap',
+            'capB',
+            'carre',
+            'centerView',
+            'chaine',
+            'class_Path',
+            'clipCurve',
+            'clipPoly',
+            'compileFormule',
+            'conv2Facet',
+            'conv2FlatPs',
+            'coord',
+            'cup',
+            'cupB',
+            'curve2Cone',
+            'curve2Cylinder',
+            'curveTube',
+            'cutBezier',
+            'defAff',
+            'defAff3d',
+            'del',
+            'det',
+            'det3d',
+            'div',
+            'domaine1',
+            'domaine2',
+            'domaine3',
+            'dproj3d',
+            'dproj3dO',
+            'drawFlatPs',
+            'drawSet',
+            'drawTeXlabel',
+            'drawTeXlabel3d',
+            'drawWin3d',
+            'dsym3d',
+            'dsym3dO',
+            'ecart',
+            'ellipseArc',
+            'engineerF',
+            'epsCoord',
+            'extractFlatPs',
+            'fact',
+            'flecher',
+            'free',
+            'ftransform',
+            'ftransform3d',
+            'geomview',
+            'getdot',
+            'getdroite',
+            'getplan',
+            'getplanEqn',
+            'grille3d',
+            'help',
+            'hom',
+            'hom3d',
+            'interDD',
+            'interDP',
+            'interLP',
+            'interPP',
+            'inv',
+            'inv3d',
+            'invmatrix',
+            'invmatrix3d',
+            'isobar',
+            'isobar3d',
+            'javaview',
+            'label',
+            'labelarc',
+            'length',
+            'length3d',
+            'line2Cone',
+            'line2Cylinder',
+            'lineTube',
+            'loadFlatPs',
+            'makeLabel3d',
+            'markangle',
+            'markseg',
+            'markseg3d',
+            'matrix',
+            'matrix3d',
+            'max',
+            'med',
+            'median',
+            'min',
+            'mod',
+            'moy',
+            'mtransform',
+            'mtransform3d',
+            'mulmatrix',
+            'mulmatrix3d',
+            'n',
+            'newxlegend',
+            'newylegend',
+            'newzlegend',
+            'nil',
+            'normalize',
+            'not',
+            'parallel',
+            'parallelo',
+            'pdfprog',
+            'periodic',
+            'permute',
+            'permute3d',
+            'perp',
+            'pgcd',
+            'planEqn',
+            'polyreg',
+            'ppcm',
+            'pqGoneReg',
+            'pqGoneReg3D',
+            'prod',
+            'proj',
+            'proj3d',
+            'proj3dO',
+            'projO',
+            'purge3d',
+            'putAbove',
+            'px',
+            'pxy',
+            'pxz',
+            'py',
+            'pyz',
+            'pz',
+            'rect',
+            'rectangle',
+            'rectangle3d',
+            'replace',
+            'replace3d',
+            'reverse',
+            'reverse3d',
+            'rot',
+            'rot3d',
+            'rotCurve',
+            'rotLine',
+            'set',
+            'setB',
+            'setminus',
+            'setminusB',
+            'shift',
+            'shift3d',
+            'simil',
+            'size',
+            'split2facet1',
+            'split2facet2',
+            'suite',
+            'sum',
+            'svgCoord',
+            'sym',
+            'sym3d',
+            'sym3dO',
+            'symG',
+            'symO',
+            'tangente',
+            'tangenteP',
+            'texCoord',
+            'transformbox3d',
+            'trianguler',
+            'var',
+            'view',
+            'view3D',
+            'viewDir',
+            'visible',
+            'wedge',
+            'zoom',
+        ),
+        7 => array( //variables prédéfinies
+            'AngleStep',
+            'Arrows',
+            'AutoReCalc',
+            'Color',
+            'ComptGraph',
+            'ComptLabel3d',
+            'DashPattern',
+            'DeltaB',
+            'DotAngle',
+            'DotScale',
+            'DotSize',
+            'DotStyle',
+            'Eofill',
+            'FillColor',
+            'FillOpacity',
+            'FillStyle',
+            'ForMinToMax',
+            'HideColor',
+            'HideStyle',
+            'HideWidth',
+            'IsVisible',
+            'LabelAngle',
+            'LabelSize',
+            'LabelStyle',
+            'LineCap',
+            'LineJoin',
+            'LineStyle',
+            'MiterLimit',
+            'MouseCode',
+            'NbBoutons',
+            'NbPoints',
+            'Origin',
+            'PenMode',
+            'RefPoint',
+            'ScriptExt',
+            'StrokeOpacity',
+            'TeXLabel',
+            'TeXify',
+            'TeXifyLabels',
+            'TphiList',
+            'Width',
+            'Xfact',
+            'Xinf',
+            'Xsup',
+            'Yfact',
+            'Yinf',
+            'Ysup',
+            'Zinf',
+            'ZoomList',
+            'Zsup',
+            'above',
+            'arrows',
+            'arrowscale',
+            'axeOrigin',
+            'backcolor',
+            'backculling',
+            'border',
+            'bordercolor',
+            'cleanLabel',
+            'clip',
+            'clipwin',
+            'close',
+            'color',
+            'contrast',
+            'cube',
+            'defaultMatrix',
+            'deg',
+            'dir',
+            'disc',
+            'dollar',
+            'dotcolor',
+            'dotscale',
+            'dotstyle',
+            'drawbox',
+            'flip',
+            'grid',
+            'gridcolor',
+            'gridwidth',
+            'height',
+            'hidden',
+            'hiddenLines',
+            'hollow',
+            'inside',
+            'label3d',
+            'labeldir',
+            'labelpos',
+            'labels',
+            'labelsep',
+            'labelsize',
+            'labelstyle',
+            'legendpos',
+            'linestyle',
+            'maxGrad',
+            'mirror',
+            'mm',
+            'nbdeci',
+            'nbdot',
+            'nbfacet',
+            'normal',
+            'numericFormat',
+            'opacity',
+            'originlabel',
+            'outside',
+            'phi',
+            'position',
+            'rad',
+            'radius',
+            'radiusscale',
+            'radscale',
+            'rotation',
+            'scale',
+            'select',
+            'showdot',
+            'smooth',
+            'stock',
+            'stock1',
+            'stock2',
+            'stock3',
+            'stock4',
+            'stock5',
+            't',
+            'tMax',
+            'tMin',
+            'tailleB',
+            'theta',
+            'tickdir',
+            'tickpos',
+            'tube',
+            'twoside',
+            'u',
+            'usecomma',
+            'v',
+            'vecI',
+            'vecJ',
+            'vecK',
+            'width',
+            'win2dList',
+            'win3dList',
+            'xaxe',
+            'xgradlimits',
+            'xlabelsep',
+            'xlabelstyle',
+            'xlegendsep',
+            'xlimits',
+            'xstep',
+            'xylabelpos',
+            'xylabelsep',
+            'xyticks',
+            'yaxe',
+            'ygradlimits',
+            'ylabelsep',
+            'ylabelstyle',
+            'ylegendsep',
+            'ylimits',
+            'ystep',
+            'zaxe',
+            'zgradlimits',
+            'zlabelsep',
+            'zlabelstyle',
+            'zlegendsep',
+            'zlimits',
+            'zstep',
+        )
+    ),
+    'SYMBOLS' => array(
+        ':=', '=', '+', '-', '*', '/',
+        '<', '>', '>=', '<=', '<>',
+        '\\', '@', ', ', ';', '#'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1  => 'color: #3ad900;font-weight: bold;',// file construction
+            2  => 'color: #A53;',// programmation structure
+            3  => 'color: #35A;font-weight: bold;',// commandes prédéfinies
+            4  => 'color: #472;',// commandes relatives à l'interface graphique
+            5  => 'color: #008080;',// constantes prédéfinies
+            6  => 'color: #808000;font-weight: bold;',// macros prédéfinies
+            7  => 'color: #000;font-weight: bold;',// variables prédéfinies
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #777;',
+            'MULTI' => 'color: #880;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #820;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #880;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #000;'
+        ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #000;'
+        ),
+        'REGEXPS' => array(
+        ),
+        'SCRIPT' => array(
+            0 => ''
+        )
+    ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://melusine.eu.org/syracuse/G/geshi/docs/texgraph/#{FNAME}',
+        4 => '',
+        5 => '',
+        6 => 'http://melusine.eu.org/syracuse/G/geshi/docs/texgraph/#{FNAME}',
+        7 => ''
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+    ),
+    'REGEXPS' => array(
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+    )
+);
diff --git a/htdocs/application/libraries/geshi/geshi/text.php b/htdocs/application/libraries/geshi/geshi/text.php
index dbb97a3..5b97cff 100644
--- a/htdocs/application/libraries/geshi/geshi/text.php
+++ b/htdocs/application/libraries/geshi/geshi/text.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Sean Hanna (smokingrope@gmail.com)
  * Copyright: (c) 2006 Sean Hanna
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 04/23/2006
  *
  * Standard Text File (No Syntax Highlighting).
diff --git a/htdocs/application/libraries/geshi/geshi/thinbasic.php b/htdocs/application/libraries/geshi/geshi/thinbasic.php
index 0783b31..d4c91e2 100644
--- a/htdocs/application/libraries/geshi/geshi/thinbasic.php
+++ b/htdocs/application/libraries/geshi/geshi/thinbasic.php
@@ -4,7 +4,7 @@
  * ------
  * Author: Eros Olmi (eros.olmi@thinbasic.com)
  * Copyright: (c) 2006 Eros Olmi (http://www.thinbasic.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/05/12
  *
  * thinBasic language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/tsql.php b/htdocs/application/libraries/geshi/geshi/tsql.php
index a990018..e333c97 100644
--- a/htdocs/application/libraries/geshi/geshi/tsql.php
+++ b/htdocs/application/libraries/geshi/geshi/tsql.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Duncan Lock (dunc@dflock.co.uk)
  * Copyright: (c) 2006 Duncan Lock (http://dflock.co.uk/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/11/22
  *
  * T-SQL language file for GeSHi.
@@ -42,52 +42,18 @@ $language_data = array (
     'COMMENT_SINGLE' => array(1 => '--'),
     'COMMENT_MULTI' => array('/*' => '*/'),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
+    'QUOTEMARKS' => array("'"),
+    'HARDQUOTE' => array("N'", "'"),
+    'ESCAPE_CHAR' => '[',
     'KEYWORDS' => array(
         1 => array(
-            // Datatypes
-            'bigint', 'tinyint', 'money',
-            'smallmoney', 'datetime', 'smalldatetime',
-            'text', 'nvarchar', 'ntext', 'varbinary', 'image',
-            'sql_variant', 'uniqueidentifier',
-
-            // Keywords
-            'ABSOLUTE', 'ACTION', 'ADD', 'ADMIN', 'AFTER', 'AGGREGATE', 'ALIAS', 'ALLOCATE', 'ALTER', 'ARE', 'ARRAY', 'AS',
-            'ASC', 'ASSERTION', 'AT', 'AUTHORIZATION', 'BACKUP', 'BEFORE', 'BEGIN', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'BOTH', 'BREADTH',
-            'BREAK', 'BROWSE', 'BULK', 'BY', 'CALL', 'CASCADE', 'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CATCH', 'CHAR', 'CHARACTER', 'CHECK', 'CHECKPOINT',
-            'CLASS', 'CLOB', 'CLOSE', 'CLUSTERED', 'COALESCE', 'COLLATE', 'COLLATION', 'COLUMN', 'COMMIT', 'COMPLETION', 'COMPUTE', 'CONNECT',
-            'CONNECTION', 'CONSTRAINT', 'CONSTRAINTS', 'CONSTRUCTOR', 'CONTAINS', 'CONTAINSTABLE', 'CONTINUE', 'CONVERT', 'CORRESPONDING', 'CREATE',
-            'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH', 'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
-            'CURSOR', 'CYCLE', 'DATA', 'DATABASE', 'DATE', 'DAY', 'DBCC', 'DEALLOCATE', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', 'DEFERRABLE',
-            'DEFERRED', 'DELETE', 'DENY', 'DEPTH', 'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR', 'DETERMINISTIC',
-            'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISK', 'DISTINCT', 'DISTRIBUTED', 'DOMAIN', 'DOUBLE', 'DROP', 'DUMMY', 'DUMP', 'DYNAMIC',
-            'EACH', 'ELSE', 'END', 'END-EXEC', 'EQUALS', 'ERRLVL', 'ESCAPE', 'EVERY', 'EXCEPT', 'EXCEPTION', 'EXEC', 'EXECUTE', 'EXIT',
-            'EXTERNAL', 'FALSE', 'FETCH', 'FILE', 'FILLFACTOR', 'FIRST', 'FLOAT', 'FOR', 'FOREIGN', 'FOUND', 'FREE', 'FREETEXT', 'FREETEXTTABLE',
-            'FROM', 'FULL', 'FUNCTION', 'GENERAL', 'GET', 'GLOBAL', 'GOTO', 'GRANT', 'GROUP', 'GROUPING', 'HAVING', 'HOLDLOCK', 'HOST', 'HOUR',
-            'IDENTITY', 'IDENTITY_INSERT', 'IDENTITYCOL', 'IF', 'IGNORE', 'IMMEDIATE', 'INDEX', 'INDICATOR', 'INITIALIZE', 'INITIALLY',
-            'INNER', 'INOUT', 'INPUT', 'INSERT', 'INT', 'INTEGER', 'INTERSECT', 'INTERVAL', 'INTO', 'IS', 'ISOLATION', 'ITERATE', 'KEY',
-            'KILL', 'LANGUAGE', 'LARGE', 'LAST', 'LATERAL', 'LEADING', 'LEFT', 'LESS', 'LEVEL', 'LIMIT', 'LINENO', 'LOAD', 'LOCAL',
-            'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATOR', 'MAP', 'MATCH', 'MINUTE', 'MODIFIES', 'MODIFY', 'MODULE', 'MONTH', 'NAMES', 'NATIONAL',
-            'NATURAL', 'NCHAR', 'NCLOB', 'NEW', 'NEXT', 'NO', 'NOCHECK', 'NONCLUSTERED', 'NONE', 'NULLIF', 'NUMERIC', 'OBJECT', 'OF',
-            'OFF', 'OFFSETS', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPENDATASOURCE', 'OPENQUERY', 'OPENROWSET', 'OPENXML', 'OPERATION', 'OPTION',
-            'ORDER', 'ORDINALITY', 'OUT', 'OUTPUT', 'OVER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARTIAL', 'PATH', 'PERCENT', 'PLAN',
-            'POSTFIX', 'PRECISION', 'PREFIX', 'PREORDER', 'PREPARE', 'PRESERVE', 'PRIMARY', 'PRINT', 'PRIOR', 'PRIVILEGES', 'PROC', 'PROCEDURE',
-            'PUBLIC', 'RAISERROR', 'READ', 'READS', 'READTEXT', 'REAL', 'RECONFIGURE', 'RECURSIVE', 'REF', 'REFERENCES', 'REFERENCING', 'RELATIVE',
-            'REPLICATION', 'RESTORE', 'RESTRICT', 'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE', 'ROW',
-            'ROWGUIDCOL', 'ROWS', 'RULE', 'SAVE', 'SAVEPOINT', 'SCHEMA', 'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECTION', 'SELECT',
-            'SEQUENCE', 'SESSION', 'SESSION_USER', 'SET', 'SETS', 'SETUSER', 'SHUTDOWN', 'SIZE', 'SMALLINT', 'SPACE', 'SPECIFIC',
-            'SPECIFICTYPE', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'START', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STRUCTURE',
-            'SYSTEM_USER', 'TABLE', 'TEMPORARY', 'TERMINATE', 'TEXTSIZE', 'THAN', 'THEN', 'TIME', 'TIMESTAMP', 'TIMEZONE_HOUR', 'TIMEZONE_MINUTE',
-            'TO', 'TOP', 'TRAILING', 'TRAN', 'TRANSACTION', 'TRANSLATION', 'TREAT', 'TRIGGER', 'TRUE', 'TRUNCATE', 'TRY', 'TSEQUAL', 'UNDER', 'UNION',
-            'UNIQUE', 'UNKNOWN', 'UNNEST', 'UPDATE', 'UPDATETEXT', 'USAGE', 'USE', 'USER', 'USING', 'VALUE', 'VALUES', 'VARCHAR', 'VARIABLE',
-            'VARYING', 'VIEW', 'WAITFOR', 'WHEN', 'WHENEVER', 'WHERE', 'WHILE', 'WITH', 'WITHOUT', 'WORK', 'WRITE', 'WRITETEXT', 'YEAR', 'ZONE',
-            'UNCOMMITTED', 'NOCOUNT',
-            ),
-        2 => array(
             /*
                 Built-in functions
                 Highlighted in pink.
+                Moved these to first array so that functions like @@ROWCOUNT
+                weren't broken up into @@ in black and ROWCOUNT in blue
+                This would prevent the correct pink coloring from taking place.
+                Not sure of any other downsides to this.
             */
 
             //Configuration Functions
@@ -100,11 +66,15 @@ $language_data = array (
 
             //Date and Time Functions
             'DATEADD','DATEDIFF','DATENAME','DATEPART','GETDATE','GETUTCDATE',
+            'DATEFROMPARTS','DATETIMEFROMPARTS', 'SMALLDATETIMEFROMPARTS', 'DATETIME2FROMPARTS', 'TIMEFROMPARTS',
+            'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'SYSDATETIME', 'SYSUTCDATETIME',
+            'YEAR', 'QUARTER', 'MONTH', 'DAY', 'HOUR', 'MINUTE', 'SECOND',
+            'EOMONTH',
 
             //Mathematical Functions
             'ABS','DEGREES','RAND','ACOS','EXP','ROUND','ASIN','FLOOR','SIGN',
             'ATAN','LOG','SIN','ATN2','LOG10','SQUARE','CEILING','PI','SQRT','COS',
-            'POWER','TAN','COT','RADIANS',
+            'POWER','TAN','COT','RADIANS', 'RANK',
 
             //Meta Data Functions
             'COL_LENGTH','COL_NAME','FULLTEXTCATALOGPROPERTY',
@@ -112,23 +82,26 @@ $language_data = array (
             'DATABASEPROPERTYEX','INDEXKEY_PROPERTY','DB_ID','INDEXPROPERTY','DB_NAME',
             'OBJECT_ID','FILE_ID','OBJECT_NAME','FILE_NAME','OBJECTPROPERTY','FILEGROUP_ID',
             '@@PROCID','FILEGROUP_NAME','SQL_VARIANT_PROPERTY','FILEGROUPPROPERTY',
-            'TYPEPROPERTY','FILEPROPERTY',
+            'TYPEPROPERTY','FILEPROPERTY','OBJECT_SCHEMA_NAME', 'SCHEMA_ID', 'SCHEMA_NAME', 'OBJECT_DEFINITION',
 
             //Security Functions
-            'IS_SRVROLEMEMBER','SUSER_SID','SUSER_SNAME','USER_ID',
-            'HAS_DBACCESS','IS_MEMBER',
+            'IS_SRVROLEMEMBER','SUSER_SID','SUSER_SNAME','USER_NAME', 'SUSER_NAME', 'USER_ID',
+            'HAS_DBACCESS','IS_MEMBER', 'CURRENT_USER',
 
             //String Functions
-            'ASCII','SOUNDEX','PATINDEX','CHARINDEX','REPLACE','STR',
+            'ASCII','SOUNDEX','PATINDEX','CHARINDEX','REPLACE','STR','LEFT', 'RIGHT','DATALENGTH','HASHBYTES',
             'DIFFERENCE','QUOTENAME','STUFF','REPLICATE','SUBSTRING','LEN',
-            'REVERSE','UNICODE','LOWER','UPPER','LTRIM','RTRIM',
+            'REVERSE','UNICODE','LOWER','UPPER','LTRIM','RTRIM','FORMAT','TRY_CONVERT','TRY_PARSE','PARSE','CONVERT','CONCAT',
 
             //System Functions
             'APP_NAME','COLLATIONPROPERTY','@@ERROR','FORMATMESSAGE',
             'GETANSINULL','HOST_ID','HOST_NAME','IDENT_CURRENT','IDENT_INCR',
-            'IDENT_SEED','@@IDENTITY','ISDATE','ISNUMERIC','PARSENAME','PERMISSIONS',
+            'IDENT_SEED','@@IDENTITY','ISDATE','ISNUMERIC','PARSENAME','PERMISSIONS','PROGRAM_NAME',
             '@@ROWCOUNT','ROWCOUNT_BIG','SCOPE_IDENTITY','SERVERPROPERTY','SESSIONPROPERTY',
-            'STATS_DATE','@@TRANCOUNT','USER_NAME',
+            'STATS_DATE','@@TRANCOUNT',
+
+            // Error handling
+            'ERROR_STATE', 'ERROR_SEVERITY', 'ERROR_NUMBER', 'ERROR_MESSAGE', 'ERROR_LINE', 'ERROR_PROCEDURE',
 
             //System Statistical Functions
             '@@CONNECTIONS','@@PACK_RECEIVED','@@CPU_BUSY','@@PACK_SENT',
@@ -140,240 +113,707 @@ $language_data = array (
 
             //Aggregate functions
             'AVG', 'MAX', 'BINARY_CHECKSUM', 'MIN', 'CHECKSUM', 'SUM', 'CHECKSUM_AGG',
-            'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'VARP'
-            ),
+            'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'VARP', 'ROW_NUMBER',
+            'LAG', 'LEAD', 'PERCENT_RANK', 'CUME_DIST', 'FIRST_VALUE', 'LAST_VALUE',
+            'PERCENTILE_CONT', 'PERCENTILE_DESC',
+
+            // Logic functions
+            'CHOOSE', 'IIF', 'ISNULL', 'COALESCE', 'NULLIF',
+
+            // GUID
+            'NEWID', 'NEWSEQUENTIALID',
+        ),
+        2 => array(
+            // Datatypes
+            'bigint', 'tinyint', 'money',
+            'smallmoney', 'datetime', 'smalldatetime',
+            'text', 'nvarchar', 'ntext', 'varbinary', 'image',
+            'sql_variant', 'uniqueidentifier', 'smallint', 'int',
+            'xml', 'hierarchyid', 'geography', 'geometry', 'varchar', 'char', 'nchar',
+            'numeric', 'decimal', 'bit', 'sysname', 'date', 'time', 'datetime2', 'datetimeoffset',
+
+            // Keywords
+            'ABSOLUTE', 'ACTION', 'ADD', 'ADMIN', 'AFTER', 'AGGREGATE', 'ALIAS', 'ALLOCATE', 'ALLOWED', 'ALTER', 'ARE', 'ARRAY', 'AS',
+            'ASC', 'ASSERTION', 'AT', 'ATOMIC', 'AUDIT', 'AUTHORIZATION', 'AVAILABILITY', 'BACKUP', 'BEFORE', 'BEGIN', 'BINARY', 'BLOB', 'BOOLEAN', 'BOTH', 'BREADTH',
+            'BREAK', 'BROWSE', 'BUCKET_COUNT', 'BULK', 'BY', 'CACHE', 'CALL', 'CASCADE', 'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CHARACTER', 'CHECK', 'CHECKCONSTRAINTS',
+            'CHECKDB', 'CHECKPOINT',
+            'CLASS', 'CLEAR', 'CLOB', 'CLOSE', 'CLUSTERED', 'COLLATE', 'COLLATION', 'COLUMN', 'COLUMNSTORE', 'COMMIT',
+            'COMMITTED', 'COMPLETION', 'COMPUTE', 'CONFIGURATION',
+            'CONNECT', 'CONNECTION', 'CONSTRAINT', 'CONSTRAINTS', 'CONSTRUCTOR', 'CONTAINMENT', 'CONTAINS', 'CONTAINSTABLE', 'CONTINUE', 'CORRESPONDING', 'CREATE',
+            'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH', 'CURRENT_ROLE',
+            'CURSOR', 'CYCLE', 'DATA', 'DATA_MIRRORING', 'DATABASE', 'DBCC', 'DEALLOCATE', 'DEC', 'DECLARE', 'DEFAULT', 'DEFERRABLE',
+            'DEFERRED', 'DELAY', 'DELAYED_DURABILITY', 'DELETE', 'DENY', 'DEPTH', 'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR', 'DETERMINISTIC',
+            'DIAGNOSTICS', 'DIALOG', 'DICTIONARY', 'DISABLED', 'DISCONNECT', 'DISK', 'DISTINCT', 'DISTRIBUTED', 'DOMAIN', 'DOUBLE', 'DROP', 'DROPCLEANBUFFERS', 'DROP_EXISTING',
+            'DUMMY', 'DUMP', 'DURABILITY', 'DYNAMIC',
+            'EACH', 'ELSE', 'END', 'END-EXEC', 'EQUALS', 'ERRLVL', 'ESCAPE', 'EVERY', 'EXCEPT', 'EXCEPTION', 'EXEC', 'EXECUTE', 'EXIT',
+            'EXTERNAL', 'FALSE', 'FETCH', 'FILE', 'FILLFACTOR', 'FIRST', 'FLOAT', 'FOR', 'FOR ATTACH', 'FOR ATTACH_REBUILD_LOG', 'FORCESCAN', 'FORCESEEK', 'FOREIGN', 'FOUND', 'FREE',
+            'FREEPROCCACHE', 'FREETEXT', 'FREETEXTTABLE',
+            'FROM', 'FUNCTION', 'GENERAL', 'GET', 'GLOBAL', 'GO', 'GOTO', 'GRANT', 'GROUP', 'GROUPING', 'HAVING', 'HOLDLOCK', 'HOST',
+            'IDENTITY', 'IDENTITY_INSERT', 'IDENTITYCOL', 'IF', 'IGNORE', 'IMMEDIATE', 'INDEX', 'INDICATOR', 'INITIALIZE', 'INITIALLY',
+            'INOUT', 'INPUT', 'INSERT', 'INTEGER', 'INTERSECT', 'INTERVAL', 'INTO', 'IS', 'ISOLATION', 'ITERATE', 'KEY',
+            'KILL', 'LANGUAGE', 'LARGE', 'LAST', 'LATERAL', 'LEADING', 'LESS', 'LEVEL', 'LIMIT', 'LINENO', 'LOAD', 'LOCAL',
+            'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATOR', 'MAP', 'MASTER KEY', 'MATCH', 'MATCHED', 'MEMORY_OPTIMIZED', 'MEMORY_OPTIMIZED_DATA', 'MEMORY_OPTIMIZED_ELEVATE_TO_SNAPSHOT', 'MESSAGE', 'MILLISECOND', 'MODIFIES', 'MODIFY', 'MODULE', 'NAMES', 'NANOSECOND', 'NATIONAL', 'NATIVE_COMPILATION',
+            'NATURAL', 'NCLOB', 'NEW', 'NEXT', 'NO', 'NO_INFOMSGS', 'NOCHECK', 'NOCOUNT', 'NONCLUSTERED', 'NONE', 'OBJECT', 'OF',
+            'OFF', 'OFFSET', 'OFFSETS', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPENDATASOURCE', 'OPENQUERY', 'OPENROWSET', 'OPENXML', 'OPERATION', 'OPTION',
+            'OPTIMIZER_WHATIF',
+            'ORDER', 'ORDINALITY', 'OUT', 'OUTPUT', 'OVER', 'OWNER', 'PAD', 'PARAMETER', 'PARTIAL', 'PARTITION', 'PASSWORD', 'PATH', 'PERCENT', 'PLAN',
+            'POSTFIX', 'PREFIX', 'PREORDER', 'PREPARE', 'PRESERVE', 'PRECEDING', 'PREVIOUS', 'PRIMARY', 'PRINT', 'PRIOR', 'PRIVILEGES', 'PROC', 'PROCEDURE',
+            'PUBLIC', 'QUERYRULEOFF', 'QUERYTRACEON', 'RAISERROR', 'RANGE', 'READ', 'READS', 'READTEXT', 'REAL', 'REBUILD', 'RECEIVE', 'RECONFIGURE', 'RECURSIVE', 'REF', 'REFERENCES', 'REFERENCING', 'RELATIVE',
+            'REPEATABLE', 'REPLICATION', 'RESTORE', 'RESTRICT', 'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE', 'ROW', 'ROWCOUNT',
+            'ROWGUIDCOL', 'ROWS', 'RULE', 'SAVE', 'SAVEPOINT', 'SCHEMA', 'SCHEMA_AND_DATA', 'SCOPE', 'SCROLL', 'SEARCH', 'SECONDS', 'SECTION', 'SELECT', 'SEND', 'SENT',
+            'SEQUENCE', 'SERIALIZABLE', 'SERVER', 'SESSION', 'SESSION_USER', 'SET', 'SETCPUWEIGHT', 'SETIOWEIGHT',
+            'SETS', 'SETUSER', 'SHOW_STATISTICS', 'SHOWWEIGHTS', 'SHUTDOWN', 'SIZE', 'SNAPSHOT', 'SPACE', 'SPECIFIC', 'SPECIFICATION',
+            'SPECIFICTYPE', 'SQL', 'SQLEXCEPTION', 'SQLPERF', 'SQLSTATE', 'SQLWARNING', 'START', 'STAT_HEADER', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STRUCTURE',
+            'SYSTEM_USER', 'TABLE', 'TEMPORARY', 'TERMINATE', 'TEXTSIZE', 'THAN', 'THEN', 'THROW', 'TIES', 'TIMESTAMP', 'TIMEZONE_HOUR', 'TIMEZONE_MINUTE',
+            'TO', 'TOP', 'TRAILING', 'TRAN', 'TRANSACTION', 'TRANSLATION', 'TREAT', 'TRIGGER', 'TRUE', 'TRUNCATE', 'TSEQUAL', 'TYPE', 'UNBOUNDED', 'UNCOMMITTED',
+            'UNDEFINED', 'UNDER', 'UNION', 'UNIQUE', 'UNKNOWN', 'UNNEST', 'UPDATE', 'UPDATETEXT', 'USAGE', 'USE', 'USER', 'USING', 'VALUE', 'VALUES',
+            'VARIABLE', 'VARYING', 'VIEW', 'WAITFOR', 'WHEN', 'WHENEVER', 'WHERE', 'WHILE', 'WITH', 'WITHIN', 'WITHOUT', 'WORK', 'WRITE', 'WRITETEXT', 'ZONE',
+
+            // cursor keywords
+            'FORWARD_ONLY', 'READ_ONLY', 'FAST_FORWARD',
+
+            // resource governor
+            'RESOURCE', 'GOVERNOR', 'POOL', 'WORKLOAD',
+
+            // other keywords that were missing or are new in SQL Server 2012.
+            'ANSI_NULL_DFLT_ON',
+            'ACCENT_SENSITIVITY', 'ACTIVATION', 'ACTIVE', 'ADDRESS', 'AES', 'AFFINITY', 'ALGORITHM', 'ALL_SPARSE_COLUMNS', 'ALLOW_MULTIPLE_EVENT_LOSS',
+            'ALLOW_PAGE_LOCKS', 'ALLOW_ROW_LOCKS', 'ALLOW_SINGLE_EVENT_LOSS', 'ALLOW_SNAPSHOT_ISOLATION', 'ANONYMOUS', 'ANSI_DEFAULTS', 'ANSI_NULL_DEFAULT',
+            'ANSI_NULL_DFLT_OFF', 'ANSI_NULLS', 'ANSI_PADDING', 'ANSI_WARNINGS', 'ARITHABORT', 'ARITHIGNORE', 'ASSEMBLY', 'ASYMMETRIC', 'ATTACH_REBUILD_LOG', 'AUTO', 'AUTO_CLEANUP',
+            'AUTO_CLOSE', 'AUTO_CREATE_STATISTICS', 'AUTO_SHRINK', 'AUTO_UPDATE_STATISTICS', 'AUTO_UPDATE_STATISTICS_ASYNC', 'BATCHSIZE', 'BEGIN_DIALOG',
+            'BINDING', 'BROKER', 'BROKER_INSTANCE', 'BULK_LOGGED', 'CAP_CPU_PERCENT', 'CATALOG_DEFAULT', 'CATCH', 'CERTIFICATE', 'CHANGE_RETENTION',
+            'CHANGE_TRACKING', 'CHECK_EXPIRATION',  'CHECK_POLICY', 'CLASSIFIER_FUNCTION', 'CLUSTER', 'CODEPAGE', 'COLLECTION',
+            'COLUMN_SET', 'COMPATIBILITY_LEVEL', 'COMPRESSION', 'CONCAT_NULL_YIELDS_NULL', 'CONTENT', 'CONTRACT', 'CONVERSATION', 'CPU', 'CPU_ID', 'CREDENTIAL',
+            'CRYPTOGRAPHIC', 'CURSOR_CLOSE_ON_COMMIT', 'CURSOR_DEFAULT', 'DATA_COMPRESSION', 'DATABASE_MIRRORING', 'DATAFILETYPE', 'DATE_CORRELATION_OPTIMIZATION',
+            'DATEFIRST', 'DATEFORMAT', 'DAYS', 'DB_CHAINING', 'DEADLOCK_PRIORITY', 'DECRYPTION', 'DEFAULT_DATABASE', 'DEFAULT_FULLTEXT_LANGUAGE', 'DEFAULT_LANGUAGE',
+            'DEFAULT_SCHEMA', 'DIRECTORY_NAME', 'DISABLE_BROKER', 'DOCUMENT', 'EMERGENCY', 'ENABLE_BROKER', 'ENCRYPTION', 'ENDPOINT', 'ERROR_BROKER_CONVERSATIONS',
+            'ERRORFILE', 'EVENT', 'EVENT_RETENTION_MODE', 'EXPAND', 'EXTERNAL_ACCESS', 'FAILOVER', 'FAST', 'FIELDTERMINATOR', 'FILEGROUP', 'FILEGROWTH', 'FILENAME',
+            'FILEPATH', 'FILESTREAM', 'FILESTREAM_ON', 'FILETABLE_DIRECTORY', 'FILETABLE_NAMESPACE', 'FIPS_FLAGGER', 'FIRE_TRIGGERS', 'FIRSTROW', 'FMTONLY', 'FORCE',
+            'FORCE_SERVICE_ALLOW_DATA_LOSS', 'FORCED', 'FORCEPLAN', 'FORMATFILE', 'FULLTEXT', 'GROUP_MAX_REQUESTS', 'HASH', 'HIGH', 'HONOR_BROKER_PRIORITY', 'HOURS',
+            'HTTP', 'IGNORE_CONSTRAINTS', 'IGNORE_DUP_KEY', 'IGNORE_NONCLUSTERED_COLUMNSTORE_INDEX', 'IGNORE_TRIGGERS', 'IMPLICIT_TRANSACTIONS', 'IMPORTANCE',
+            'INCLUDE', 'INCREMENT', 'INCREMENTAL', 'INFINITE', 'INIT', 'INITIATOR', 'INSTEAD', 'IO', 'KB', 'KEEP', 'KEEPDEFAULTS', 'KEEPFIXED', 'KEEPIDENTITY',
+            'KEEPNULLS', 'KERBEROS', 'KILOBYTES_PER_BATCH', 'LASTROW', 'LIFETIME', 'LIST', 'LISTENER_IP', 'LISTENER_PORT', 'LOCAL_SERVICE_NAME', 'LOCK_ESCALATION',
+            'LOCK_TIMEOUT', 'LOOP', 'LOW', 'MAX_CPU_PERCENT', 'MAX_DISPATCH_LATENCY', 'MAX_DOP', 'MAX_EVENT_SIZE', 'MAX_FILES', 'MAX_MEMORY', 'MAX_MEMORY_PERCENT',
+            'MAX_QUEUE_READERS', 'MAX_ROLLOVER_FILES', 'MAXDOP', 'MAXERRORS', 'MAXRECURSION', 'MAXSIZE', 'MAXVALUE', 'MB', 'MEDIUM', 'MEMORY_PARTITION_MODE',
+            'MERGE', 'MESSAGE_FORWARD_SIZE', 'MESSAGE_FORWARDING', 'MIN_CPU_PERCENT', 'MIN_MEMORY_PERCENT', 'MINUTES', 'MINVALUE', 'MIRROR_ADDRESS', 'MOVE',
+            'MULTI_USER', 'MUST_CHANGE', 'NEGOTIATE', 'NESTED_TRIGGERS', 'NEW_ACCOUNT', 'NEW_BROKER', 'NEWNAME', 'NO_COMPRESSION', 'NO_EVENT_LOSS', 'NO_WAIT', 'NOEXEC', 'NOEXPAND',
+            'NOLOCK', 'NON_TRANSACTED_ACESS', 'NOWAIT', 'NTLM', 'NUMA_NODE_ID', 'NUMANODE', 'NUMERIC_ROUNDABORT', 'OFFLINE', 'OLD_ACCOUNT', 'ON_FAILURE', 'ONLINE',
+            'OPTIMIZE', 'OVERRIDE', 'PAD_INDEX', 'PAGE', 'PAGE_VERIFY', 'PAGLOCK', 'PARAMETERIZATION', 'PARSEONLY', 'PARTITIONS', 'PARTNER', 'PER_CPU', 'PER_NODE',
+            'PERMISSION_SET', 'PERSISTED', 'POISON_MESSAGE_HANDLING', 'POPULATION', 'PRIORITY', 'PRIORITY_LEVEL', 'PRIVATE', 'PROCEDURE_NAME', 'PROCESS', 'PROFILE',
+            'PROPERTY', 'PROPERTY_DESCRIPTION', 'PROPERTY_INT_ID', 'PROPERTY_SET_GUID', 'PROVIDER', 'QUERY_GOVERNOR_COST_LIMIT', 'QUEUE', 'QUEUE_DELAY',
+            'QUOTED_IDENTIFIER', 'RC4', 'READ_COMMITTED_SNAPSHOT', 'READ_WRITE', 'READCOMMITTED', 'READCOMMITTEDLOCK', 'READONLY', 'READPAST', 'READUNCOMMITTED',
+            'READWRITE', 'RECOMPILE', 'RECOVERY', 'RECOVERY FULL', 'RECOVERY SIMPLE', 'RECURSIVE_TRIGGERS', 'REGENERATE', 'REMOTE', 'REMOTE_PROC_TRANSACTIONS', 'REMOTE_SERVICE_NAME', 'REMOVE',
+            'REPEATABLEREAD', 'REQUEST_MAX_CPU_TIME_SEC', 'REQUEST_MAX_MEMORY_GRANT_PERCENT', 'REQUEST_MEMORY_GRANT_TIMEOUT_SEC', 'REQUIRED', 'RESERVE_DISK_SPACE',
+            'RESET', 'RESTART', 'RESTRICTED_USER', 'RESUME', 'RETENTION', 'ROBUST', 'ROUTE', 'ROWLOCK', 'ROWS_PER_BATCH', 'ROWTERMINATOR', 'SAFE', 'SAFETY',
+            'SCHEDULER', 'SCHEMABINDING', 'SCHEME', 'SECRET', 'SERVICE', 'SERVICE_BROKER', 'SERVICE_NAME', 'SETERROR', 'SHOWPLAN', 'SHOWPLAN_ALL', 'SHOWPLAN_TEXT',
+            'SHOWPLAN_XML', 'SIMPLE', 'SINGLE_USER', 'SORT_IN_TEMPDB', 'SOURCE', 'SPARSE', 'SPATIAL_WINDOW_MAX_CELLS', 'SPLIT', 'STARTED', 'STARTUP_STATE',
+            'STATISTICAL_SEMANTICS', 'STATISTICS_NORECOMPUTE', 'STATUS', 'STOP', 'STOPLIST', 'STOPPED', 'SUPPORTED', 'SUSPEND', 'SWITCH', 'SYMMETRIC', 'SYNONYM',
+            'SYSTEM', 'TABLOCK', 'TABLOCKX', 'TARGET', 'TARGET_RECOVERY_TIME', 'TCP', 'TIMEOUT', 'TORN_PAGE_DETECTION', 'TRACK_CAUSALITY', 'TRACK_COLUMNS_UPDATED',
+            'TRANSFER', 'TRANSFORM_NOISE_WORDS', 'TRUSTWORTHY', 'TRY', 'TSQL', 'TWO_DIGIT_YEAR_CUTOFF', 'UNCHECKED', 'UNLIMITED', 'UNLOCK', 'UNSAFE', 'UPDLOCK',
+            'USED', 'VALID_XML', 'VALIDATION', 'VIEW_METADATA', 'VISIBILITY', 'WEEKDAY', 'WELL_FORMED_XML', 'WINDOWS', 'WITH SUBJECT', 'WITNESS', 'XACT_ABORT', 'XLOCK',
+
+            /* AlwaysOn stuff */
+            'AUTHENTICATION', 'ENDPOINT_URL', 'LISTENER', 'COPY_ONLY', 'NORECOVERY', 'NOUNLOAD', 'HADR', 'PORT',
+            'FAILOVER_MODE', 'MANUAL', 'AVAILABILITY_MODE', 'ASYNCHRONOUS_COMMIT', 'SYNCHRONOUS_COMMIT', 'AUTOMATIC', 'REPLICA', 'READ_ONLY_ROUTING_URL', 'BACKUP_PRIORITY', 'SECONDARY_ROLE', 'ALLOW_CONNECTIONS', 'AUTOMATED_BACKUP_PREFERENCE', 'SECONDARY', 'SECONDARY_ONLY', 'PRIMARY_ROLE', 'READ_ONLY_ROUTING_LIST',
+        ),
         3 => array(
             /*
                 System stored procedures
                 Higlighted dark brown
             */
 
-            //Active Directory Procedures
-            'sp_ActiveDirectory_Obj', 'sp_ActiveDirectory_SCP',
+            // CLR stored procedures
+            'sp_FuzzyLookupTableMaintenanceInstall', 'sp_FuzzyLookupTableMaintenanceInvoke', 'sp_FuzzyLookupTableMaintenanceUninstall',
 
-            //Catalog Procedures
-            'sp_column_privileges', 'sp_special_columns', 'sp_columns', 'sp_sproc_columns',
-            'sp_databases', 'sp_statistics', 'sp_fkeys', 'sp_stored_procedures', 'sp_pkeys',
-            'sp_table_privileges', 'sp_server_info', 'sp_tables',
+            // system procedures named with xp_
+            'xp_grantlogin', 'xp_logininfo', 'xp_repl_convert_encrypt_sysadmin_wrapper', 'xp_revokelogin',
 
-            //Cursor Procedures
-            'sp_cursor_list', 'sp_describe_cursor_columns', 'sp_describe_cursor', 'sp_describe_cursor_tables',
+            // extended procedures
+            'xp_availablemedia',  'xp_cmdshell', 'xp_create_subdir', 'xp_delete_file', 'xp_dirtree', 'xp_enum_oledb_providers',
+            'xp_enumerrorlogs', 'xp_enumgroups',  'xp_fileexist', 'xp_fixeddrives', 'xp_get_script', 'xp_get_tape_devices',
+            'xp_getnetname', 'xp_instance_regaddmultistring',  'xp_instance_regdeletekey', 'xp_instance_regdeletevalue',
+            'xp_instance_regenumkeys', 'xp_instance_regenumvalues',  'xp_instance_regread', 'xp_instance_regremovemultistring',
+            'xp_instance_regwrite', 'xp_logevent', 'xp_loginconfig', 'xp_msver',  'xp_msx_enlist', 'xp_passAgentInfo',
+            'xp_prop_oledb_provider', 'xp_qv', 'xp_readerrorlog', 'xp_regaddmultistring',  'xp_regdeletekey', 'xp_regdeletevalue',
+            'xp_regenumkeys', 'xp_regenumvalues', 'xp_regread', 'xp_regremovemultistring',  'xp_regwrite', 'xp_replposteor',
+            'xp_servicecontrol', 'xp_sprintf', 'xp_sqlagent_enum_jobs', 'xp_sqlagent_is_starting',  'xp_sqlagent_monitor',
+            'xp_sqlagent_notify', 'xp_sqlagent_param', 'xp_sqlmaint', 'xp_sscanf', 'xp_subdirs',  'xp_sysmail_activate',
+            'xp_sysmail_attachment_load',  'xp_sysmail_format_query',
 
-            //Database Maintenance Plan Procedures
-            'sp_add_maintenance_plan', 'sp_delete_maintenance_plan_db', 'sp_add_maintenance_plan_db',
-            'sp_delete_maintenance_plan_job', 'sp_add_maintenance_plan_job', 'sp_help_maintenance_plan',
-            'sp_delete_maintenance_plan',
+            // extended procedures named with sp_
+            'sp_AddFunctionalUnitToComponent', 'sp_audit_write', 'sp_availability_group_command_internal', 'sp_begin_parallel_nested_tran',
+            'sp_bindsession', 'sp_change_tracking_waitforchanges', 'sp_commit_parallel_nested_tran', 'sp_control_dbmasterkey_password',
+            'sp_createorphan', 'sp_cursor', 'sp_cursorclose', 'sp_cursorexecute', 'sp_cursorfetch', 'sp_cursoropen', 'sp_cursoroption',
+            'sp_cursorprepare', 'sp_cursorprepexec', 'sp_cursorunprepare', 'sp_delete_http_namespace_reservation',
+            'sp_describe_first_result_set', 'sp_describe_undeclared_parameters', 'sp_droporphans', 'sp_enable_sql_debug', 'sp_execute',
+            'sp_executesql', 'sp_fulltext_getdata', 'sp_fulltext_keymappings', 'sp_fulltext_pendingchanges', 'sp_get_query_template',
+            'sp_getbindtoken', 'sp_getschemalock', 'sp_http_generate_wsdl_complex', 'sp_http_generate_wsdl_simple',
+            'sp_migrate_user_to_contained', 'sp_new_parallel_nested_tran_id', 'sp_OACreate', 'sp_OADestroy', 'sp_OAGetErrorInfo',
+            'sp_OAGetProperty', 'sp_OAMethod', 'sp_OASetProperty', 'sp_OAStop', 'sp_PostAgentInfo', 'sp_prepare', 'sp_prepexec',
+            'sp_prepexecrpc', 'sp_releaseschemalock', 'sp_repl_generateevent', 'sp_replcmds', 'sp_replcounters', 'sp_replddlparser',
+            'sp_repldone', 'sp_replflush', 'sp_replhelp', 'sp_replsendtoqueue', 'sp_replsetsyncstatus', 'sp_repltrans',
+            'sp_replwritetovarbin', 'sp_reserve_http_namespace', 'sp_reset_connection', 'sp_resyncexecute', 'sp_resyncexecutesql',
+            'sp_resyncprepare', 'sp_resyncuniquetable', 'sp_rollback_parallel_nested_tran', 'sp_server_diagnostics',
+            'sp_SetOBDCertificate', 'sp_setuserbylogin', 'sp_showmemo_xml', 'sp_start_user_instance', 'sp_testlinkedserver',
+            'sp_trace_create', 'sp_trace_generateevent', 'sp_trace_setevent', 'sp_trace_setfilter', 'sp_trace_setstatus', 'sp_unprepare',
+            'sp_update_user_instance', 'sp_xml_preparedocument', 'sp_xml_removedocument', 'sp_xp_cmdshell_proxy_account'
 
-            //Distributed Queries Procedures
-            'sp_addlinkedserver', 'sp_indexes', 'sp_addlinkedsrvlogin', 'sp_linkedservers', 'sp_catalogs',
-            'sp_primarykeys', 'sp_column_privileges_ex', 'sp_columns_ex',
-            'sp_table_privileges_ex', 'sp_tables_ex', 'sp_foreignkeys',
-
-            //Full-Text Search Procedures
-            'sp_fulltext_catalog', 'sp_help_fulltext_catalogs_cursor', 'sp_fulltext_column',
-            'sp_help_fulltext_columns', 'sp_fulltext_database', 'sp_help_fulltext_columns_cursor',
-            'sp_fulltext_service', 'sp_help_fulltext_tables', 'sp_fulltext_table',
-            'sp_help_fulltext_tables_cursor', 'sp_help_fulltext_catalogs',
-
-            //Log Shipping Procedures
-            'sp_add_log_shipping_database', 'sp_delete_log_shipping_database', 'sp_add_log_shipping_plan',
-            'sp_delete_log_shipping_plan', 'sp_add_log_shipping_plan_database',
-            'sp_delete_log_shipping_plan_database', 'sp_add_log_shipping_primary',
-            'sp_delete_log_shipping_primary', 'sp_add_log_shipping_secondary',
-            'sp_delete_log_shipping_secondary', 'sp_can_tlog_be_applied', 'sp_get_log_shipping_monitor_info',
-            'sp_change_monitor_role', 'sp_remove_log_shipping_monitor', 'sp_change_primary_role',
-            'sp_resolve_logins', 'sp_change_secondary_role', 'sp_update_log_shipping_monitor_info',
-            'sp_create_log_shipping_monitor_account', 'sp_update_log_shipping_plan',
-            'sp_define_log_shipping_monitor', 'sp_update_log_shipping_plan_database',
-
-            //OLE Automation Extended Stored Procedures
-            'sp_OACreate', 'sp_OAMethod', 'sp_OADestroy', 'sp_OASetProperty', 'sp_OAGetErrorInfo',
-            'sp_OAStop', 'sp_OAGetProperty',
-
-            //Replication Procedures
-            'sp_add_agent_parameter', 'sp_enableagentoffload', 'sp_add_agent_profile',
-            'sp_enumcustomresolvers', 'sp_addarticle', 'sp_enumdsn', 'sp_adddistpublisher',
-            'sp_enumfullsubscribers', 'sp_adddistributiondb', 'sp_expired_subscription_cleanup',
-            'sp_adddistributor', 'sp_generatefilters', 'sp_addmergealternatepublisher',
-            'sp_getagentoffloadinfo', 'sp_addmergearticle', 'sp_getmergedeletetype', 'sp_addmergefilter',
-            'sp_get_distributor', 'sp_addmergepublication', 'sp_getqueuedrows', 'sp_addmergepullsubscription',
-            'sp_getsubscriptiondtspackagename', 'sp_addmergepullsubscription_agent', 'sp_grant_publication_access',
-            'sp_addmergesubscription', 'sp_help_agent_default', 'sp_addpublication', 'sp_help_agent_parameter',
-            'sp_addpublication_snapshot', 'sp_help_agent_profile', 'sp_addpublisher70', 'sp_helparticle',
-            'sp_addpullsubscription', 'sp_helparticlecolumns', 'sp_addpullsubscription_agent', 'sp_helparticledts',
-            'sp_addscriptexec', 'sp_helpdistpublisher', 'sp_addsubscriber', 'sp_helpdistributiondb',
-            'sp_addsubscriber_schedule', 'sp_helpdistributor', 'sp_addsubscription', 'sp_helpmergealternatepublisher',
-            'sp_addsynctriggers', 'sp_helpmergearticle', 'sp_addtabletocontents', 'sp_helpmergearticlecolumn',
-            'sp_adjustpublisheridentityrange', 'sp_helpmergearticleconflicts', 'sp_article_validation',
-            'sp_helpmergeconflictrows', 'sp_articlecolumn', 'sp_helpmergedeleteconflictrows', 'sp_articlefilter',
-            'sp_helpmergefilter', 'sp_articlesynctranprocs', 'sp_helpmergepublication', 'sp_articleview',
-            'sp_helpmergepullsubscription', 'sp_attachsubscription', 'sp_helpmergesubscription', 'sp_browsesnapshotfolder',
-            'sp_helppublication', 'sp_browsemergesnapshotfolder', 'sp_help_publication_access', 'sp_browsereplcmds',
-            'sp_helppullsubscription', 'sp_change_agent_parameter', 'sp_helpreplfailovermode', 'sp_change_agent_profile',
-            'sp_helpreplicationdboption', 'sp_changearticle', 'sp_helpreplicationoption', 'sp_changedistpublisher',
-            'sp_helpsubscriberinfo', 'sp_changedistributiondb', 'sp_helpsubscription', 'sp_changedistributor_password',
-            'sp_ivindexhasnullcols', 'sp_changedistributor_property', 'sp_helpsubscription_properties', 'sp_changemergearticle',
-            'sp_link_publication', 'sp_changemergefilter', 'sp_marksubscriptionvalidation', 'sp_changemergepublication',
-            'sp_mergearticlecolumn', 'sp_changemergepullsubscription', 'sp_mergecleanupmetadata', 'sp_changemergesubscription',
-            'sp_mergedummyupdate', 'sp_changepublication', 'sp_mergesubscription_cleanup', 'sp_changesubscriber',
-            'sp_publication_validation', 'sp_changesubscriber_schedule', 'sp_refreshsubscriptions', 'sp_changesubscriptiondtsinfo',
-            'sp_reinitmergepullsubscription', 'sp_changesubstatus', 'sp_reinitmergesubscription', 'sp_change_subscription_properties',
-            'sp_reinitpullsubscription', 'sp_check_for_sync_trigger', 'sp_reinitsubscription', 'sp_copymergesnapshot',
-            'sp_removedbreplication', 'sp_copysnapshot', 'sp_repladdcolumn', 'sp_copysubscription', 'sp_replcmds',
-            'sp_deletemergeconflictrow', 'sp_replcounters', 'sp_disableagentoffload', 'sp_repldone', 'sp_drop_agent_parameter',
-            'sp_repldropcolumn', 'sp_drop_agent_profile', 'sp_replflush', 'sp_droparticle', 'sp_replicationdboption',
-            'sp_dropanonymouseagent', 'sp_replication_agent_checkup', 'sp_dropdistpublisher', 'sp_replqueuemonitor',
-            'sp_dropdistributiondb', 'sp_replsetoriginator', 'sp_dropmergealternatepublisher', 'sp_replshowcmds',
-            'sp_dropdistributor', 'sp_repltrans', 'sp_dropmergearticle', 'sp_restoredbreplication', 'sp_dropmergefilter',
-            'sp_revoke_publication_access', 'sp_scriptsubconflicttable', 'sp_dropmergepublication', 'sp_script_synctran_commands',
-            'sp_dropmergepullsubscription', 'sp_setreplfailovermode', 'sp_showrowreplicainfo', 'sp_dropmergesubscription',
-            'sp_subscription_cleanup', 'sp_droppublication', 'sp_table_validation', 'sp_droppullsubscription',
-            'sp_update_agent_profile', 'sp_dropsubscriber', 'sp_validatemergepublication', 'sp_dropsubscription',
-            'sp_validatemergesubscription', 'sp_dsninfo', 'sp_vupgrade_replication', 'sp_dumpparamcmd',
-
-            //Security Procedures
-            'sp_addalias', 'sp_droprolemember', 'sp_addapprole', 'sp_dropserver', 'sp_addgroup', 'sp_dropsrvrolemember',
-            'sp_dropuser', 'sp_addlogin', 'sp_grantdbaccess', 'sp_addremotelogin',
-            'sp_grantlogin', 'sp_addrole', 'sp_helpdbfixedrole', 'sp_addrolemember', 'sp_helpgroup',
-            'sp_addserver', 'sp_helplinkedsrvlogin', 'sp_addsrvrolemember', 'sp_helplogins', 'sp_adduser',
-            'sp_helpntgroup', 'sp_approlepassword', 'sp_helpremotelogin', 'sp_changedbowner', 'sp_helprole',
-            'sp_changegroup', 'sp_helprolemember', 'sp_changeobjectowner', 'sp_helprotect', 'sp_change_users_login',
-            'sp_helpsrvrole', 'sp_dbfixedrolepermission', 'sp_helpsrvrolemember', 'sp_defaultdb', 'sp_helpuser',
-            'sp_defaultlanguage', 'sp_MShasdbaccess', 'sp_denylogin', 'sp_password', 'sp_dropalias', 'sp_remoteoption',
-            'sp_dropapprole', 'sp_revokedbaccess', 'sp_dropgroup', 'sp_revokelogin', 'sp_droplinkedsrvlogin',
-            'sp_setapprole', 'sp_droplogin', 'sp_srvrolepermission', 'sp_dropremotelogin', 'sp_validatelogins', 'sp_droprole',
-
-            //SQL Mail Procedures
-            'sp_processmail', 'xp_sendmail', 'xp_deletemail', 'xp_startmail', 'xp_findnextmsg', 'xp_stopmail', 'xp_readmail',
-
-            //SQL Profiler Procedures
-            'sp_trace_create', 'sp_trace_setfilter', 'sp_trace_generateevent', 'sp_trace_setstatus', 'sp_trace_setevent',
-
-            //SQL Server Agent Procedures
-            'sp_add_alert', 'sp_help_jobhistory', 'sp_add_category', 'sp_help_jobschedule', 'sp_add_job',
-            'sp_help_jobserver', 'sp_add_jobschedule', 'sp_help_jobstep', 'sp_add_jobserver', 'sp_help_notification',
-            'sp_add_jobstep', 'sp_help_operator', 'sp_add_notification', 'sp_help_targetserver',
-            'sp_add_operator', 'sp_help_targetservergroup', 'sp_add_targetservergroup', 'sp_helptask',
-            'sp_add_targetsvrgrp_member', 'sp_manage_jobs_by_login', 'sp_addtask', 'sp_msx_defect',
-            'sp_apply_job_to_targets', 'sp_msx_enlist', 'sp_delete_alert', 'sp_post_msx_operation',
-            'sp_delete_category', 'sp_purgehistory', 'sp_delete_job', 'sp_purge_jobhistory', 'sp_delete_jobschedule',
-            'sp_reassigntask', 'sp_delete_jobserver', 'sp_remove_job_from_targets', 'sp_delete_jobstep',
-            'sp_resync_targetserver', 'sp_delete_notification', 'sp_start_job', 'sp_delete_operator',
-            'sp_stop_job', 'sp_delete_targetserver', 'sp_update_alert', 'sp_delete_targetservergroup',
-            'sp_update_category', 'sp_delete_targetsvrgrp_member', 'sp_update_job', 'sp_droptask',
-            'sp_update_jobschedule', 'sp_help_alert', 'sp_update_jobstep', 'sp_help_category',
-            'sp_update_notification', 'sp_help_downloadlist', 'sp_update_operator', 'sp_helphistory',
-            'sp_update_targetservergroup', 'sp_help_job', 'sp_updatetask', 'xp_sqlagent_proxy_account',
-
-            //System Procedures
-            'sp_add_data_file_recover_suspect_db', 'sp_helpconstraint', 'sp_addextendedproc',
-            'sp_helpdb', 'sp_addextendedproperty', 'sp_helpdevice', 'sp_add_log_file_recover_suspect_db',
-            'sp_helpextendedproc', 'sp_addmessage', 'sp_helpfile', 'sp_addtype', 'sp_helpfilegroup',
-            'sp_addumpdevice', 'sp_helpindex', 'sp_altermessage', 'sp_helplanguage', 'sp_autostats',
-            'sp_helpserver', 'sp_attach_db', 'sp_helpsort', 'sp_attach_single_file_db', 'sp_helpstats',
-            'sp_bindefault', 'sp_helptext', 'sp_bindrule', 'sp_helptrigger', 'sp_bindsession',
-            'sp_indexoption', 'sp_certify_removable', 'sp_invalidate_textptr', 'sp_configure',
-            'sp_lock', 'sp_create_removable', 'sp_monitor', 'sp_createstats', 'sp_procoption',
-            'sp_cycle_errorlog', 'sp_recompile', 'sp_datatype_info', 'sp_refreshview', 'sp_dbcmptlevel',
-            'sp_releaseapplock', 'sp_dboption', 'sp_rename', 'sp_dbremove', 'sp_renamedb',
-            'sp_delete_backuphistory', 'sp_resetstatus', 'sp_depends', 'sp_serveroption', 'sp_detach_db',
-            'sp_setnetname', 'sp_dropdevice', 'sp_settriggerorder', 'sp_dropextendedproc', 'sp_spaceused',
-            'sp_dropextendedproperty', 'sp_tableoption', 'sp_dropmessage', 'sp_unbindefault', 'sp_droptype',
-            'sp_unbindrule', 'sp_executesql', 'sp_updateextendedproperty', 'sp_getapplock', 'sp_updatestats',
-            'sp_getbindtoken', 'sp_validname', 'sp_help', 'sp_who',
-
-            //Web Assistant Procedures
-            'sp_dropwebtask', 'sp_makewebtask', 'sp_enumcodepages', 'sp_runwebtask',
-
-            //XML Procedures
-            'sp_xml_preparedocument', 'sp_xml_removedocument',
-
-            //General Extended Procedures
-            'xp_cmdshellxp_logininfo', 'xp_enumgroups', 'xp_msver', 'xp_findnextmsgxp_revokelogin',
-            'xp_grantlogin', 'xp_sprintf', 'xp_logevent', 'xp_sqlmaint', 'xp_loginconfig', 'xp_sscanf',
-
-            //API System Stored Procedures
-            'sp_cursor', 'sp_cursorclose', 'sp_cursorexecute', 'sp_cursorfetch', 'sp_cursoropen',
-            'sp_cursoroption', 'sp_cursorprepare', 'sp_cursorunprepare', 'sp_execute', 'sp_prepare', 'sp_unprepare',
-
-            //Misc
-            'sp_createorphan', 'sp_droporphans', 'sp_reset_connection', 'sp_sdidebug'
-            ),
+        ),
         4 => array(
-            //Function/sp's higlighted brown.
-            'fn_helpcollations', 'fn_listextendedproperty ', 'fn_servershareddrives',
-            'fn_trace_geteventinfo', 'fn_trace_getfilterinfo', 'fn_trace_getinfo',
-            'fn_trace_gettable', 'fn_virtualfilestats','fn_listextendedproperty',
-            ),
+            // DMVs/DMFs/catalog views etc. highlighted green.
+
+            //schemas
+            'sys', 'INFORMATION_SCHEMA',
+
+            // inline TVFs
+            'dm_cryptographic_provider_algorithms','dm_cryptographic_provider_keys','dm_cryptographic_provider_sessions',
+            'dm_db_database_page_allocations','dm_db_index_operational_stats','dm_db_index_physical_stats',
+            'dm_db_missing_index_columns','dm_db_objects_disabled_on_compatibility_level_change',
+            'dm_exec_cached_plan_dependent_objects','dm_exec_cursors','dm_exec_describe_first_result_set',
+            'dm_exec_describe_first_result_set_for_object','dm_exec_plan_attributes','dm_exec_query_plan','dm_exec_sql_text',
+            'dm_exec_text_query_plan','dm_exec_xml_handles','dm_fts_index_keywords','dm_fts_index_keywords_by_document',
+            'dm_fts_index_keywords_by_property','dm_fts_parser','dm_io_virtual_file_stats','dm_logconsumer_cachebufferrefs',
+            'dm_logconsumer_privatecachebuffers','dm_logpool_consumers','dm_logpool_sharedcachebuffers','dm_logpoolmgr_freepools',
+            'dm_logpoolmgr_respoolsize','dm_logpoolmgr_stats','dm_os_volume_stats','dm_sql_referenced_entities',
+            'dm_sql_referencing_entities','fn_builtin_permissions','fn_check_object_signatures','fn_dblog','fn_dump_dblog',
+            'fn_get_audit_file','fn_get_sql','fn_helpcollations','fn_MSxe_read_event_stream','fn_trace_gettable',
+            'fn_translate_permissions', 'fn_validate_plan_guide',  'fn_xe_file_target_read_file',
+
+            // multi-statement TVFs
+            'fn_EnumCurrentPrincipals', 'fn_helpdatatypemap', 'fn_listextendedproperty', 'fn_my_permissions',
+            'fn_PhysLocCracker', 'fn_replgetcolidfrombitmap', 'fn_RowDumpCracker', 'fn_servershareddrives',
+            'fn_trace_geteventinfo', 'fn_trace_getfilterinfo', 'fn_trace_getinfo',  'fn_virtualfilestats',
+            'fn_virtualservernodes',
+
+            // aggregate functions
+            'GeographyCollectionAggregate', 'GeographyConvexHullAggregate', 'GeographyEnvelopeAggregate', 'GeographyUnionAggregate',
+            'GeometryCollectionAggregate', 'GeometryConvexHullAggregate', 'GeometryEnvelopeAggregate', 'GeometryUnionAggregate',
+            'ORMask',
+
+            // scalar functions
+            'fn_cColvEntries_80','fn_cdc_check_parameters','fn_cdc_get_column_ordinal','fn_cdc_get_max_lsn','fn_cdc_get_min_lsn',
+            'fn_cdc_has_column_changed','fn_cdc_hexstrtobin','fn_cdc_map_lsn_to_time','fn_cdc_map_time_to_lsn','fn_fIsColTracked',
+            'fn_GetCurrentPrincipal','fn_GetRowsetIdFromRowDump','fn_hadr_backup_is_preferred_replica','fn_IsBitSetInBitmask',
+            'fn_isrolemember','fn_MapSchemaType','fn_MSdayasnumber','fn_MSgeneration_downloadonly','fn_MSget_dynamic_filter_login',
+            'fn_MSorbitmaps','fn_MSrepl_map_resolver_clsid','fn_MStestbit','fn_MSvector_downloadonly','fn_numberOf1InBinaryAfterLoc',
+            'fn_numberOf1InVarBinary','fn_PhysLocFormatter','fn_repladjustcolumnmap','fn_repldecryptver4','fn_replformatdatetime',
+            'fn_replgetparsedddlcmd','fn_replp2pversiontotranid', 'fn_replreplacesinglequote',
+            'fn_replreplacesinglequoteplusprotectstring', 'fn_repluniquename', 'fn_replvarbintoint', 'fn_sqlvarbasetostr',
+            'fn_varbintohexstr', 'fn_varbintohexsubstring', 'fn_yukonsecuritymodelrequired',
+
+            // service queues
+            'EventNotificationErrorsQueue', 'QueryNotificationErrorsQueue', 'ServiceBrokerQueue',
+
+            // system tables
+            'sysallocunits','sysasymkeys','sysaudacts','sysbinobjs','sysbinsubobjs','sysbrickfiles','syscerts','syschildinsts','sysclones','sysclsobjs',
+            'syscolpars','syscompfragments','sysconvgroup','syscscolsegments','syscsdictionaries','sysdbfiles','sysdbfrag','sysdbreg','sysdercv','sysdesend',
+            'sysendpts','sysfgfrag','sysfiles1','sysfoqueues','sysfos','sysftinds','sysftproperties','sysftsemanticsdb','sysftstops','sysguidrefs',
+            'sysidxstats','sysiscols','syslnklgns','sysmultiobjrefs','sysnsobjs','sysobjkeycrypts','sysobjvalues','sysowners','sysphfg','syspriorities',
+            'sysprivs','syspru','sysprufiles','sysqnames','sysremsvcbinds','sysrmtlgns','sysrowsetrefs','sysrowsets','sysrscols','sysrts',
+            'sysscalartypes','sysschobjs','sysseobjvalues','syssingleobjrefs','syssoftobjrefs','syssqlguides','systypedsubobjs','sysusermsgs','syswebmethods',
+            'sysxlgns','sysxmitbody', 'sysxmitqueue', 'sysxmlcomponent', 'sysxmlfacet', 'sysxmlplacement', 'sysxprops', 'sysxsrvs',
+
+            // user tables (these are currently in dbo schema but will be fixed)
+            'trace_xe_action_map', 'trace_xe_event_map',
+
+            // backward compatibility views
+            'sysaltfiles', 'syscacheobjects', 'syscharsets', 'syscolumns', 'syscomments', 'sysconfigures', 'sysconstraints', 'syscurconfigs', 'syscursorcolumns',
+            'syscursorrefs', 'syscursors', 'syscursortables', 'sysdatabases', 'sysdepends', 'sysdevices', 'sysfilegroups', 'sysfiles', 'sysforeignkeys',
+            'sysfulltextcatalogs', 'sysindexes', 'sysindexkeys', 'syslanguages', 'syslockinfo', 'syslogins', 'sysmembers', 'sysmessages', 'sysobjects',
+            'sysoledbusers', 'sysopentapes', 'sysperfinfo', 'syspermissions', 'sysprocesses', 'sysprotects', 'sysreferences', 'sysremotelogins', 'sysservers',
+            'systypes', 'sysusers',
+
+            // INFORMATION_SCHEMA views
+            'COLUMN_DOMAIN_USAGE', 'COLUMN_PRIVILEGES', 'COLUMNS', 'CONSTRAINT_COLUMN_USAGE',
+            'CONSTRAINT_TABLE_USAGE', 'KEY_COLUMN_USAGE', 'PARAMETERS', 'REFERENTIAL_CONSTRAINTS', 'ROUTINE_COLUMNS',
+            'ROUTINES', 'SCHEMATA', 'SEQUENCES', 'TABLE_CONSTRAINTS', 'TABLE_PRIVILEGES', 'TABLES', 'VIEW_COLUMN_USAGE',
+            'VIEW_TABLE_USAGE', 'VIEWS',
+
+            // catalog views
+            'default_constraints',
+            'all_columns', 'all_objects', 'all_parameters', 'all_sql_modules', 'all_views', 'allocation_units',
+            'assemblies', 'assembly_files', 'assembly_modules', 'assembly_references', 'assembly_types', 'asymmetric_keys',
+            'availability_databases_cluster', 'availability_group_listener_ip_addresses', 'availability_group_listeners',
+            'availability_groups', 'availability_groups_cluster', 'availability_read_only_routing_lists',
+            'availability_replicas', 'backup_devices', 'certificates', 'change_tracking_databases', 'change_tracking_tables',
+            'check_constraints', 'column_store_dictionaries', 'column_store_index_stats', 'column_store_segments',
+            'column_type_usages', 'column_xml_schema_collection_usages', 'computed_columns', 'configurations',
+            'conversation_endpoints', 'conversation_groups', 'conversation_priorities', 'credentials', 'crypt_properties',
+            'cryptographic_providers', 'databases', 'endpoint_webmethods', 'endpoints', 'event_notification_event_types',
+            'event_notifications', 'events', 'extended_procedures', 'extended_properties', 'filegroups',
+            'filetable_system_defined_objects', 'filetables', 'foreign_key_columns', 'foreign_keys', 'fulltext_catalogs',
+            'fulltext_document_types', 'fulltext_index_catalog_usages', 'fulltext_index_columns', 'fulltext_index_fragments',
+            'fulltext_indexes', 'fulltext_languages', 'fulltext_semantic_language_statistics_database',
+            'fulltext_semantic_languages', 'fulltext_stoplists', 'fulltext_stopwords', 'fulltext_system_stopwords',
+            'function_order_columns', 'http_endpoints', 'identity_columns', 'index_columns', 'indexes', 'internal_tables',
+            'key_constraints', 'key_encryptions', 'linked_logins', 'login_token', 'master_files', 'numbered_procedure_parameters',
+            'numbered_procedures', 'objects', 'openkeys', 'parameter_type_usages', 'parameter_xml_schema_collection_usages',
+            'partition_functions', 'partition_parameters', 'partition_range_values', 'partition_schemes',
+            'partitions', 'plan_guides', 'procedures', 'registered_search_properties', 'registered_search_property_lists',
+            'remote_logins', 'remote_service_bindings', 'resource_governor_configuration',  'resource_governor_resource_pool_affinity',
+            'resource_governor_resource_pools', 'resource_governor_workload_groups', 'routes', 'schemas', 'securable_classes',
+            'server_assembly_modules', 'server_audit_specification_details', 'server_audit_specifications',
+            'server_audits', 'server_event_notifications', 'server_event_session_actions', 'server_event_session_events',
+            'server_event_session_fields', 'server_event_session_targets', 'server_event_sessions', 'server_events',
+            'server_file_audits', 'server_permissions', 'server_principal_credentials', 'server_principals', 'server_role_members',
+            'server_sql_modules', 'server_trigger_events', 'server_triggers', 'servers', 'service_broker_endpoints',
+            'service_contract_message_usages', 'service_contract_usages', 'service_contracts', 'service_message_types',
+            'service_queue_usages', 'service_queues', 'services', 'soap_endpoints', 'spatial_index_tessellations', 'spatial_indexes',
+            'spatial_reference_systems', 'sql_dependencies', 'sql_expression_dependencies', 'sql_logins', 'sql_modules', 'stats',
+            'stats_columns', 'symmetric_keys', 'synonyms', 'system_columns', 'system_components_surface_area_configuration',
+            'system_internals_allocation_units', 'system_internals_partition_columns', 'system_internals_partitions', 'system_objects',
+            'system_parameters', 'system_sql_modules', 'system_views', 'table_types', 'tcp_endpoints', 'trace_categories',
+            'trace_columns', 'trace_event_bindings', 'trace_events', 'trace_subclass_values', 'traces', 'transmission_queue',
+            'trigger_event_types', 'trigger_events', 'triggers', 'type_assembly_usages', 'types', 'user_token', 'via_endpoints',
+            'xml_indexes', 'xml_schema_attributes', 'xml_schema_collections', 'xml_schema_component_placements',
+            'xml_schema_components',  'xml_schema_elements', 'xml_schema_facets', 'xml_schema_model_groups', 'xml_schema_namespaces',
+            'xml_schema_types', 'xml_schema_wildcard_namespaces', 'xml_schema_wildcards',
+
+            // DMVs / DMFs
+            'dm_audit_actions', 'dm_audit_class_type_map', 'dm_broker_activated_tasks', 'dm_broker_connections', 'dm_broker_forwarded_messages',
+            'dm_broker_queue_monitors', 'dm_cdc_errors', 'dm_cdc_log_scan_sessions', 'dm_clr_appdomains', 'dm_clr_loaded_assemblies',
+            'dm_clr_properties', 'dm_clr_tasks', 'dm_cryptographic_provider_properties', 'dm_database_encryption_keys', 'dm_db_file_space_usage',
+            'dm_db_fts_index_physical_stats', 'dm_db_index_usage_stats', 'dm_db_log_space_usage', 'dm_db_mirroring_auto_page_repair',
+            'dm_db_mirroring_connections', 'dm_db_mirroring_past_actions', 'dm_db_missing_index_details', 'dm_db_missing_index_group_stats',
+            'dm_db_missing_index_groups', 'dm_db_partition_stats', 'dm_db_persisted_sku_features', 'dm_db_script_level', 'dm_db_session_space_usage',
+            'dm_db_task_space_usage', 'dm_db_uncontained_entities', 'dm_exec_background_job_queue', 'dm_exec_background_job_queue_stats',
+            'dm_exec_cached_plans', 'dm_exec_connections', 'dm_exec_procedure_stats', 'dm_exec_query_memory_grants', 'dm_exec_query_optimizer_info', 'dm_exec_query_profiles',
+            'dm_exec_query_resource_semaphores', 'dm_exec_query_stats', 'dm_exec_query_transformation_stats', 'dm_exec_requests', 'dm_exec_sessions',
+            'dm_exec_trigger_stats', 'dm_filestream_file_io_handles', 'dm_filestream_file_io_requests', 'dm_filestream_non_transacted_handles',
+            'dm_fts_active_catalogs', 'dm_fts_fdhosts', 'dm_fts_index_population', 'dm_fts_memory_buffers', 'dm_fts_memory_pools',
+            'dm_fts_outstanding_batches', 'dm_fts_population_ranges', 'dm_fts_semantic_similarity_population', 'dm_hadr_auto_page_repair',
+            'dm_hadr_availability_group_states', 'dm_hadr_availability_replica_cluster_nodes', 'dm_hadr_availability_replica_cluster_states',
+            'dm_hadr_availability_replica_states', 'dm_hadr_cluster', 'dm_hadr_cluster_members', 'dm_hadr_cluster_networks',
+            'dm_hadr_database_replica_cluster_states', 'dm_hadr_database_replica_states', 'dm_hadr_instance_node_map', 'dm_hadr_name_id_map',
+            'dm_io_backup_tapes', 'dm_io_cluster_shared_drives', 'dm_io_pending_io_requests', 'dm_logpool_hashentries',
+            'dm_logpool_stats', 'dm_os_buffer_descriptors', 'dm_os_child_instances', 'dm_os_cluster_nodes', 'dm_os_cluster_properties',
+            'dm_os_dispatcher_pools', 'dm_os_dispatchers', 'dm_os_hosts', 'dm_os_latch_stats', 'dm_os_loaded_modules',
+            'dm_os_memory_allocations', 'dm_os_memory_broker_clerks', 'dm_os_memory_brokers', 'dm_os_memory_cache_clock_hands',
+            'dm_os_memory_cache_counters', 'dm_os_memory_cache_entries', 'dm_os_memory_cache_hash_tables', 'dm_os_memory_clerks',
+            'dm_os_memory_node_access_stats', 'dm_os_memory_nodes', 'dm_os_memory_objects', 'dm_os_memory_pools', 'dm_os_nodes',
+            'dm_os_performance_counters', 'dm_os_process_memory', 'dm_os_ring_buffers', 'dm_os_schedulers',
+            'dm_os_server_diagnostics_log_configurations', 'dm_os_spinlock_stats', 'dm_os_stacks', 'dm_os_sublatches', 'dm_os_sys_info',
+            'dm_os_sys_memory', 'dm_os_tasks', 'dm_os_threads', 'dm_os_virtual_address_dump', 'dm_os_wait_stats', 'dm_os_waiting_tasks',
+            'dm_os_windows_info', 'dm_os_worker_local_storage', 'dm_os_workers', 'dm_qn_subscriptions', 'dm_repl_articles', 'dm_repl_schemas',
+            'dm_repl_tranhash', 'dm_repl_traninfo', 'dm_resource_governor_configuration', 'dm_resource_governor_resource_pool_affinity',
+            'dm_resource_governor_resource_pools', 'dm_resource_governor_workload_groups', 'dm_server_audit_status', 'dm_server_memory_dumps',
+            'dm_server_registry', 'dm_server_services', 'dm_tcp_listener_states', 'dm_tran_active_snapshot_database_transactions',
+            'dm_tran_active_transactions', 'dm_tran_commit_table', 'dm_tran_current_snapshot', 'dm_tran_current_transaction',
+            'dm_tran_database_transactions', 'dm_tran_locks', 'dm_tran_session_transactions', 'dm_tran_top_version_generators',
+            'dm_tran_transactions_snapshot', 'dm_tran_version_store', 'dm_xe_map_values', 'dm_xe_object_columns', 'dm_xe_objects', 'dm_xe_packages', 'dm_xe_sessions', 'dm_xe_session_targets',
+        ),
         5 => array(
-            'ALL', 'AND', 'ANY', 'BETWEEN', 'CROSS', 'EXISTS', 'IN', 'JOIN', 'LIKE', 'NOT', 'NULL',
-            'OR', 'OUTER', 'SOME',
-            )
+
+            // system procedures (sorry, not categorized, but definitely more complete and updated for Denali)
+            // moved these to their own array because they overloaded array 3
+
+            'sp_add_agent_parameter', 'sp_add_agent_profile', 'sp_add_data_file_recover_suspect_db', 'sp_add_log_file_recover_suspect_db',
+            'sp_add_log_shipping_alert_job', 'sp_add_log_shipping_primary_database', 'sp_add_log_shipping_primary_secondary',
+            'sp_add_log_shipping_secondary_database', 'sp_add_log_shipping_secondary_primary', 'sp_addapprole', 'sp_addarticle',
+            'sp_adddatatype', 'sp_adddatatypemapping', 'sp_adddistpublisher', 'sp_adddistributiondb', 'sp_adddistributor',
+            'sp_adddynamicsnapshot_job', 'sp_addextendedproc', 'sp_addextendedproperty', 'sp_addlinkedserver', 'sp_addlinkedsrvlogin',
+            'sp_addlogin', 'sp_addlogreader_agent', 'sp_addmergealternatepublisher', 'sp_addmergearticle', 'sp_addmergefilter',
+            'sp_addmergelogsettings', 'sp_addmergepartition', 'sp_addmergepublication', 'sp_addmergepullsubscription',
+            'sp_addmergepullsubscription_agent', 'sp_addmergepushsubscription_agent', 'sp_addmergesubscription', 'sp_addmessage',
+            'sp_addpublication', 'sp_addpublication_snapshot', 'sp_addpullsubscription', 'sp_addpullsubscription_agent',
+            'sp_addpushsubscription_agent', 'sp_addqreader_agent', 'sp_addqueued_artinfo', 'sp_addremotelogin', 'sp_addrole',
+            'sp_addrolemember', 'sp_addscriptexec', 'sp_addserver', 'sp_addsrvrolemember', 'sp_addsubscriber', 'sp_addsubscriber_schedule',
+            'sp_addsubscription', 'sp_addsynctriggers', 'sp_addsynctriggerscore', 'sp_addtabletocontents', 'sp_addtype', 'sp_addumpdevice',
+            'sp_adduser', 'sp_adjustpublisheridentityrange', 'sp_altermessage', 'sp_approlepassword', 'sp_article_validation',
+            'sp_articlecolumn', 'sp_articlefilter', 'sp_articleview', 'sp_assemblies_rowset', 'sp_assemblies_rowset_rmt',
+            'sp_assemblies_rowset2', 'sp_assembly_dependencies_rowset', 'sp_assembly_dependencies_rowset_rmt',
+            'sp_assembly_dependencies_rowset2', 'sp_attach_db', 'sp_attach_single_file_db', 'sp_attachsubscription', 'sp_autostats',
+            'sp_bcp_dbcmptlevel', 'sp_bindefault', 'sp_bindrule', 'sp_browsemergesnapshotfolder', 'sp_browsereplcmds',
+            'sp_browsesnapshotfolder', 'sp_can_tlog_be_applied', 'sp_catalogs', 'sp_catalogs_rowset', 'sp_catalogs_rowset_rmt',
+            'sp_catalogs_rowset2', 'sp_cdc_add_job', 'sp_cdc_change_job', 'sp_cdc_cleanup_change_table', 'sp_cdc_dbsnapshotLSN',
+            'sp_cdc_disable_db', 'sp_cdc_disable_table', 'sp_cdc_drop_job', 'sp_cdc_enable_db', 'sp_cdc_enable_table',
+            'sp_cdc_generate_wrapper_function', 'sp_cdc_get_captured_columns', 'sp_cdc_get_ddl_history', 'sp_cdc_help_change_data_capture',
+            'sp_cdc_help_jobs', 'sp_cdc_restoredb', 'sp_cdc_scan', 'sp_cdc_start_job', 'sp_cdc_stop_job', 'sp_cdc_vupgrade',
+            'sp_cdc_vupgrade_databases', 'sp_certify_removable', 'sp_change_agent_parameter', 'sp_change_agent_profile',
+            'sp_change_log_shipping_primary_database', 'sp_change_log_shipping_secondary_database', 'sp_change_log_shipping_secondary_primary',
+            'sp_change_subscription_properties', 'sp_change_users_login', 'sp_changearticle', 'sp_changearticlecolumndatatype',
+            'sp_changedbowner', 'sp_changedistpublisher', 'sp_changedistributiondb', 'sp_changedistributor_password',
+            'sp_changedistributor_property', 'sp_changedynamicsnapshot_job', 'sp_changelogreader_agent', 'sp_changemergearticle',
+            'sp_changemergefilter', 'sp_changemergelogsettings', 'sp_changemergepublication', 'sp_changemergepullsubscription',
+            'sp_changemergesubscription', 'sp_changeobjectowner', 'sp_changepublication', 'sp_changepublication_snapshot',
+            'sp_changeqreader_agent', 'sp_changereplicationserverpasswords', 'sp_changesubscriber', 'sp_changesubscriber_schedule',
+            'sp_changesubscription', 'sp_changesubscriptiondtsinfo', 'sp_changesubstatus', 'sp_check_constbytable_rowset',
+            'sp_check_constbytable_rowset2', 'sp_check_constraints_rowset', 'sp_check_constraints_rowset2', 'sp_check_dynamic_filters',
+            'sp_check_for_sync_trigger', 'sp_check_join_filter', 'sp_check_log_shipping_monitor_alert', 'sp_check_publication_access',
+            'sp_check_removable', 'sp_check_subset_filter', 'sp_check_sync_trigger', 'sp_checkinvalidivarticle',
+            'sp_checkOraclepackageversion', 'sp_clean_db_file_free_space', 'sp_clean_db_free_space', 'sp_cleanmergelogfiles',
+            'sp_cleanup_log_shipping_history', 'sp_cleanupdbreplication', 'sp_column_privileges', 'sp_column_privileges_ex',
+            'sp_column_privileges_rowset', 'sp_column_privileges_rowset_rmt', 'sp_column_privileges_rowset2', 'sp_columns', 'sp_columns_100',
+            'sp_columns_100_rowset', 'sp_columns_100_rowset2', 'sp_columns_90', 'sp_columns_90_rowset', 'sp_columns_90_rowset_rmt',
+            'sp_columns_90_rowset2', 'sp_columns_ex', 'sp_columns_ex_100', 'sp_columns_ex_90', 'sp_columns_managed', 'sp_columns_rowset',
+            'sp_columns_rowset_rmt', 'sp_columns_rowset2', 'sp_configure', 'sp_configure_peerconflictdetection', 'sp_constr_col_usage_rowset',
+            'sp_constr_col_usage_rowset2', 'sp_control_plan_guide', 'sp_copymergesnapshot', 'sp_copysnapshot', 'sp_copysubscription',
+            'sp_create_plan_guide', 'sp_create_plan_guide_from_handle', 'sp_create_removable', 'sp_createmergepalrole', 'sp_createstats',
+            'sp_createtranpalrole', 'sp_cursor_list', 'sp_cycle_errorlog', 'sp_databases', 'sp_datatype_info', 'sp_datatype_info_100',
+            'sp_datatype_info_90', 'sp_db_increased_partitions', 'sp_db_vardecimal_storage_format', 'sp_dbcmptlevel', 'sp_dbfixedrolepermission',
+            'sp_dbmmonitoraddmonitoring', 'sp_dbmmonitorchangealert', 'sp_dbmmonitorchangemonitoring', 'sp_dbmmonitordropalert',
+            'sp_dbmmonitordropmonitoring', 'sp_dbmmonitorhelpalert', 'sp_dbmmonitorhelpmonitoring', 'sp_dbmmonitorresults', 'sp_dbmmonitorupdate',
+            'sp_dbremove', 'sp_ddopen', 'sp_defaultdb', 'sp_defaultlanguage', 'sp_delete_log_shipping_alert_job',
+            'sp_delete_log_shipping_primary_database', 'sp_delete_log_shipping_primary_secondary', 'sp_delete_log_shipping_secondary_database',
+            'sp_delete_log_shipping_secondary_primary', 'sp_deletemergeconflictrow', 'sp_deletepeerrequesthistory', 'sp_deletetracertokenhistory',
+            'sp_denylogin', 'sp_depends', 'sp_describe_cursor', 'sp_describe_cursor_columns', 'sp_describe_cursor_tables', 'sp_detach_db',
+            'sp_disableagentoffload', 'sp_distcounters', 'sp_drop_agent_parameter', 'sp_drop_agent_profile', 'sp_dropanonymousagent',
+            'sp_dropanonymoussubscription', 'sp_dropapprole', 'sp_droparticle', 'sp_dropdatatypemapping', 'sp_dropdevice', 'sp_dropdistpublisher',
+            'sp_dropdistributiondb', 'sp_dropdistributor', 'sp_dropdynamicsnapshot_job', 'sp_dropextendedproc', 'sp_dropextendedproperty',
+            'sp_droplinkedsrvlogin', 'sp_droplogin', 'sp_dropmergealternatepublisher', 'sp_dropmergearticle', 'sp_dropmergefilter',
+            'sp_dropmergelogsettings', 'sp_dropmergepartition', 'sp_dropmergepublication', 'sp_dropmergepullsubscription',
+            'sp_dropmergesubscription', 'sp_dropmessage', 'sp_droppublication', 'sp_droppublisher', 'sp_droppullsubscription',
+            'sp_dropremotelogin', 'sp_dropreplsymmetrickey', 'sp_droprole', 'sp_droprolemember', 'sp_dropserver', 'sp_dropsrvrolemember',
+            'sp_dropsubscriber', 'sp_dropsubscription', 'sp_droptype', 'sp_dropuser', 'sp_dsninfo', 'sp_enable_heterogeneous_subscription',
+            'sp_enableagentoffload', 'sp_enum_oledb_providers', 'sp_enumcustomresolvers', 'sp_enumdsn', 'sp_enumeratependingschemachanges',
+            'sp_enumerrorlogs', 'sp_enumfullsubscribers', 'sp_enumoledbdatasources', 'sp_estimate_data_compression_savings',
+            'sp_estimated_rowsize_reduction_for_vardecimal', 'sp_expired_subscription_cleanup', 'sp_filestream_force_garbage_collection',
+            'sp_filestream_recalculate_container_size', 'sp_firstonly_bitmap', 'sp_fkeys', 'sp_flush_commit_table',
+            'sp_flush_commit_table_on_demand', 'sp_foreign_keys_rowset', 'sp_foreign_keys_rowset_rmt', 'sp_foreign_keys_rowset2',
+            'sp_foreign_keys_rowset3', 'sp_foreignkeys', 'sp_fulltext_catalog', 'sp_fulltext_column', 'sp_fulltext_database',
+            'sp_fulltext_load_thesaurus_file', 'sp_fulltext_recycle_crawl_log', 'sp_fulltext_semantic_register_language_statistics_db',
+            'sp_fulltext_semantic_unregister_language_statistics_db', 'sp_fulltext_service', 'sp_fulltext_table', 'sp_generate_agent_parameter',
+            'sp_generatefilters', 'sp_get_distributor', 'sp_get_job_status_mergesubscription_agent', 'sp_get_mergepublishedarticleproperties',
+            'sp_get_Oracle_publisher_metadata', 'sp_get_redirected_publisher', 'sp_getagentparameterlist', 'sp_getapplock',
+            'sp_getdefaultdatatypemapping', 'sp_getmergedeletetype', 'sp_getProcessorUsage', 'sp_getpublisherlink',
+            'sp_getqueuedarticlesynctraninfo', 'sp_getqueuedrows', 'sp_getsqlqueueversion', 'sp_getsubscription_status_hsnapshot',
+            'sp_getsubscriptiondtspackagename', 'sp_gettopologyinfo', 'sp_getVolumeFreeSpace', 'sp_grant_publication_access', 'sp_grantdbaccess',
+            'sp_grantlogin', 'sp_help', 'sp_help_agent_default', 'sp_help_agent_parameter', 'sp_help_agent_profile', 'sp_help_datatype_mapping',
+            'sp_help_fulltext_catalog_components', 'sp_help_fulltext_catalogs', 'sp_help_fulltext_catalogs_cursor', 'sp_help_fulltext_columns',
+            'sp_help_fulltext_columns_cursor', 'sp_help_fulltext_system_components', 'sp_help_fulltext_tables', 'sp_help_fulltext_tables_cursor',
+            'sp_help_log_shipping_alert_job', 'sp_help_log_shipping_monitor', 'sp_help_log_shipping_monitor_primary',
+            'sp_help_log_shipping_monitor_secondary', 'sp_help_log_shipping_primary_database', 'sp_help_log_shipping_primary_secondary',
+            'sp_help_log_shipping_secondary_database', 'sp_help_log_shipping_secondary_primary', 'sp_help_peerconflictdetection',
+            'sp_help_publication_access', 'sp_help_spatial_geography_histogram', 'sp_help_spatial_geography_index',
+            'sp_help_spatial_geography_index_xml', 'sp_help_spatial_geometry_histogram', 'sp_help_spatial_geometry_index',
+            'sp_help_spatial_geometry_index_xml', 'sp_helpallowmerge_publication', 'sp_helparticle', 'sp_helparticlecolumns', 'sp_helparticledts',
+            'sp_helpconstraint', 'sp_helpdatatypemap', 'sp_helpdb', 'sp_helpdbfixedrole', 'sp_helpdevice', 'sp_helpdistpublisher',
+            'sp_helpdistributiondb', 'sp_helpdistributor', 'sp_helpdistributor_properties', 'sp_helpdynamicsnapshot_job', 'sp_helpextendedproc',
+            'sp_helpfile', 'sp_helpfilegroup', 'sp_helpindex', 'sp_helplanguage', 'sp_helplinkedsrvlogin', 'sp_helplogins', 'sp_helplogreader_agent',
+            'sp_helpmergealternatepublisher', 'sp_helpmergearticle', 'sp_helpmergearticlecolumn', 'sp_helpmergearticleconflicts',
+            'sp_helpmergeconflictrows', 'sp_helpmergedeleteconflictrows', 'sp_helpmergefilter', 'sp_helpmergelogfiles',
+            'sp_helpmergelogfileswithdata', 'sp_helpmergelogsettings', 'sp_helpmergepartition', 'sp_helpmergepublication',
+            'sp_helpmergepullsubscription', 'sp_helpmergesubscription', 'sp_helpntgroup', 'sp_helppeerrequests', 'sp_helppeerresponses',
+            'sp_helppublication', 'sp_helppublication_snapshot', 'sp_helppublicationsync', 'sp_helppullsubscription', 'sp_helpqreader_agent',
+            'sp_helpremotelogin', 'sp_helpreplfailovermode', 'sp_helpreplicationdb', 'sp_helpreplicationdboption', 'sp_helpreplicationoption',
+            'sp_helprole', 'sp_helprolemember', 'sp_helprotect', 'sp_helpserver', 'sp_helpsort', 'sp_helpsrvrole', 'sp_helpsrvrolemember',
+            'sp_helpstats', 'sp_helpsubscriberinfo', 'sp_helpsubscription', 'sp_helpsubscription_properties', 'sp_helpsubscriptionerrors',
+            'sp_helptext', 'sp_helptracertokenhistory', 'sp_helptracertokens', 'sp_helptrigger', 'sp_helpuser', 'sp_helpxactsetjob',
+            'sp_hexadecimal', 'sp_http_generate_wsdl_defaultcomplexorsimple', 'sp_http_generate_wsdl_defaultsimpleorcomplex',
+            'sp_identitycolumnforreplication', 'sp_IH_LR_GetCacheData', 'sp_IHadd_sync_command', 'sp_IHarticlecolumn',
+            'sp_IHget_loopback_detection', 'sp_IHScriptIdxFile', 'sp_IHScriptSchFile', 'sp_IHValidateRowFilter', 'sp_IHXactSetJob',
+            'sp_indexcolumns_managed', 'sp_indexes', 'sp_indexes_100_rowset', 'sp_indexes_100_rowset2', 'sp_indexes_90_rowset',
+            'sp_indexes_90_rowset_rmt', 'sp_indexes_90_rowset2', 'sp_indexes_managed', 'sp_indexes_rowset', 'sp_indexes_rowset_rmt',
+            'sp_indexes_rowset2', 'sp_indexoption', 'sp_invalidate_textptr', 'sp_is_makegeneration_needed', 'sp_ivindexhasnullcols',
+            'sp_kill_filestream_non_transacted_handles', 'sp_lightweightmergemetadataretentioncleanup', 'sp_link_publication',
+            'sp_linkedservers', 'sp_linkedservers_rowset', 'sp_linkedservers_rowset2', 'sp_lock', 'sp_logshippinginstallmetadata',
+            'sp_lookupcustomresolver', 'sp_mapdown_bitmap', 'sp_markpendingschemachange', 'sp_marksubscriptionvalidation', 'sp_mergearticlecolumn',
+            'sp_mergecleanupmetadata', 'sp_mergedummyupdate', 'sp_mergemetadataretentioncleanup', 'sp_mergesubscription_cleanup',
+            'sp_mergesubscriptionsummary', 'sp_monitor',
+            'sp_objectfilegroup',
+            'sp_oledb_database', 'sp_oledb_defdb', 'sp_oledb_deflang', 'sp_oledb_language', 'sp_oledb_ro_usrname', 'sp_oledbinfo', 'sp_ORbitmap',
+            'sp_password', 'sp_peerconflictdetection_tableaug', 'sp_pkeys', 'sp_posttracertoken', 'sp_primary_keys_rowset',
+            'sp_primary_keys_rowset_rmt', 'sp_primary_keys_rowset2', 'sp_primarykeys', 'sp_procedure_params_100_managed',
+            'sp_procedure_params_100_rowset', 'sp_procedure_params_100_rowset2', 'sp_procedure_params_90_rowset', 'sp_procedure_params_90_rowset2',
+            'sp_procedure_params_managed', 'sp_procedure_params_rowset', 'sp_procedure_params_rowset2', 'sp_procedures_rowset', 'sp_procedures_rowset2',
+            'sp_processlogshippingmonitorhistory', 'sp_processlogshippingmonitorprimary', 'sp_processlogshippingmonitorsecondary',
+            'sp_processlogshippingretentioncleanup', 'sp_procoption', 'sp_prop_oledb_provider', 'sp_provider_types_100_rowset',
+            'sp_provider_types_90_rowset', 'sp_provider_types_rowset', 'sp_publication_validation', 'sp_publicationsummary', 'sp_publishdb',
+            'sp_publisherproperty', 'sp_readerrorlog', 'sp_recompile', 'sp_redirect_publisher', 'sp_refresh_heterogeneous_publisher',
+            'sp_refresh_log_shipping_monitor', 'sp_refreshsqlmodule', 'sp_refreshsubscriptions', 'sp_refreshview', 'sp_register_custom_scripting',
+            'sp_registercustomresolver', 'sp_reinitmergepullsubscription', 'sp_reinitmergesubscription', 'sp_reinitpullsubscription',
+            'sp_reinitsubscription', 'sp_releaseapplock', 'sp_remoteoption', 'sp_removedbreplication', 'sp_removedistpublisherdbreplication',
+            'sp_removesrvreplication', 'sp_rename', 'sp_renamedb', 'sp_repladdcolumn', 'sp_replcleanupccsprocs', 'sp_repldeletequeuedtran',
+            'sp_repldropcolumn', 'sp_replgetparsedddlcmd', 'sp_replica', 'sp_replication_agent_checkup', 'sp_replicationdboption', 'sp_replincrementlsn',
+            'sp_replmonitorchangepublicationthreshold', 'sp_replmonitorhelpmergesession', 'sp_replmonitorhelpmergesessiondetail',
+            'sp_replmonitorhelpmergesubscriptionmoreinfo', 'sp_replmonitorhelppublication', 'sp_replmonitorhelppublicationthresholds',
+            'sp_replmonitorhelppublisher', 'sp_replmonitorhelpsubscription', 'sp_replmonitorrefreshjob', 'sp_replmonitorsubscriptionpendingcmds',
+            'sp_replpostsyncstatus', 'sp_replqueuemonitor', 'sp_replrestart', 'sp_replrethrow', 'sp_replsetoriginator', 'sp_replshowcmds',
+            'sp_replsqlqgetrows', 'sp_replsync', 'sp_requestpeerresponse', 'sp_requestpeertopologyinfo', 'sp_resetsnapshotdeliveryprogress',
+            'sp_resetstatus', 'sp_resign_database', 'sp_resolve_logins', 'sp_restoredbreplication', 'sp_restoremergeidentityrange',
+            'sp_resyncmergesubscription', 'sp_revoke_publication_access', 'sp_revokedbaccess', 'sp_revokelogin', 'sp_schemafilter', 'sp_schemata_rowset',
+            'sp_script_reconciliation_delproc', 'sp_script_reconciliation_insproc', 'sp_script_reconciliation_sinsproc',
+            'sp_script_reconciliation_vdelproc', 'sp_script_reconciliation_xdelproc', 'sp_script_synctran_commands', 'sp_scriptdelproc',
+            'sp_scriptdynamicupdproc', 'sp_scriptinsproc', 'sp_scriptmappedupdproc', 'sp_scriptpublicationcustomprocs', 'sp_scriptsinsproc',
+            'sp_scriptsubconflicttable', 'sp_scriptsupdproc', 'sp_scriptupdproc', 'sp_scriptvdelproc', 'sp_scriptvupdproc', 'sp_scriptxdelproc',
+            'sp_scriptxupdproc', 'sp_sequence_get_range', 'sp_server_info', 'sp_serveroption', 'sp_setapprole', 'sp_SetAutoSAPasswordAndDisable',
+            'sp_setdefaultdatatypemapping', 'sp_setnetname', 'sp_setOraclepackageversion', 'sp_setreplfailovermode', 'sp_setsubscriptionxactseqno',
+            'sp_settriggerorder', 'sp_showcolv', 'sp_showlineage', 'sp_showpendingchanges', 'sp_showrowreplicainfo', 'sp_spaceused',
+            'sp_sparse_columns_100_rowset', 'sp_special_columns', 'sp_special_columns_100', 'sp_special_columns_90', 'sp_sproc_columns',
+            'sp_sproc_columns_100', 'sp_sproc_columns_90', 'sp_sqlexec', 'sp_srvrolepermission', 'sp_startmergepullsubscription_agent',
+            'sp_startmergepushsubscription_agent', 'sp_startpublication_snapshot', 'sp_startpullsubscription_agent', 'sp_startpushsubscription_agent',
+            'sp_statistics', 'sp_statistics_100', 'sp_statistics_rowset', 'sp_statistics_rowset2', 'sp_stopmergepullsubscription_agent',
+            'sp_stopmergepushsubscription_agent', 'sp_stoppublication_snapshot', 'sp_stoppullsubscription_agent', 'sp_stoppushsubscription_agent',
+            'sp_stored_procedures', 'sp_subscribe', 'sp_subscription_cleanup', 'sp_subscriptionsummary', 'sp_syspolicy_execute_policy',
+            'sp_syspolicy_subscribe_to_policy_category', 'sp_syspolicy_unsubscribe_from_policy_category', 'sp_syspolicy_update_ddl_trigger',
+            'sp_syspolicy_update_event_notification', 'sp_table_constraints_rowset', 'sp_table_constraints_rowset2', 'sp_table_privileges',
+            'sp_table_privileges_ex', 'sp_table_privileges_rowset', 'sp_table_privileges_rowset_rmt', 'sp_table_privileges_rowset2',
+            'sp_table_statistics_rowset', 'sp_table_statistics2_rowset', 'sp_table_type_columns_100', 'sp_table_type_columns_100_rowset',
+            'sp_table_type_pkeys', 'sp_table_type_primary_keys_rowset', 'sp_table_types', 'sp_table_types_rowset', 'sp_table_validation',
+            'sp_tablecollations', 'sp_tablecollations_100', 'sp_tablecollations_90', 'sp_tableoption', 'sp_tables', 'sp_tables_ex',
+            'sp_tables_info_90_rowset', 'sp_tables_info_90_rowset_64', 'sp_tables_info_90_rowset2', 'sp_tables_info_90_rowset2_64',
+            'sp_tables_info_rowset', 'sp_tables_info_rowset_64', 'sp_tables_info_rowset2', 'sp_tables_info_rowset2_64', 'sp_tables_rowset',
+            'sp_tables_rowset_rmt', 'sp_tables_rowset2', 'sp_tableswc', 'sp_trace_getdata', 'sp_unbindefault', 'sp_unbindrule',
+            'sp_unregister_custom_scripting', 'sp_unregistercustomresolver', 'sp_unsetapprole', 'sp_unsubscribe', 'sp_update_agent_profile',
+            'sp_updateextendedproperty', 'sp_updatestats', 'sp_upgrade_log_shipping', 'sp_user_counter1', 'sp_user_counter10', 'sp_user_counter2',
+            'sp_user_counter3', 'sp_user_counter4', 'sp_user_counter5', 'sp_user_counter6', 'sp_user_counter7', 'sp_user_counter8', 'sp_user_counter9',
+            'sp_usertypes_rowset', 'sp_usertypes_rowset_rmt', 'sp_usertypes_rowset2', 'sp_validate_redirected_publisher',
+            'sp_validate_replica_hosts_as_publishers', 'sp_validatecache', 'sp_validatelogins', 'sp_validatemergepublication',
+            'sp_validatemergepullsubscription', 'sp_validatemergesubscription', 'sp_validlang', 'sp_validname', 'sp_verifypublisher', 'sp_views_rowset',
+            'sp_views_rowset2', 'sp_vupgrade_mergeobjects', 'sp_vupgrade_mergetables',  'sp_vupgrade_replication', 'sp_vupgrade_replsecurity_metadata',
+            'sp_who', 'sp_who2', 'sp_xml_schema_rowset', 'sp_xml_schema_rowset2',
         ),
+        6 => array(
+
+            // system MS procedures, marked brown.
+
+            'sp_MS_marksystemobject', 'sp_MS_replication_installed', 'sp_MSacquireHeadofQueueLock',
+            'sp_MSacquireserverresourcefordynamicsnapshot', 'sp_MSacquireSlotLock', 'sp_MSacquiresnapshotdeliverysessionlock',
+            'sp_MSactivate_auto_sub', 'sp_MSactivatelogbasedarticleobject', 'sp_MSactivateprocedureexecutionarticleobject',
+            'sp_MSadd_anonymous_agent', 'sp_MSadd_article', 'sp_MSadd_compensating_cmd', 'sp_MSadd_distribution_agent',
+            'sp_MSadd_distribution_history', 'sp_MSadd_dynamic_snapshot_location', 'sp_MSadd_filteringcolumn', 'sp_MSadd_log_shipping_error_detail',
+            'sp_MSadd_log_shipping_history_detail', 'sp_MSadd_logreader_agent', 'sp_MSadd_logreader_history', 'sp_MSadd_merge_agent',
+            'sp_MSadd_merge_anonymous_agent', 'sp_MSadd_merge_history', 'sp_MSadd_merge_history90', 'sp_MSadd_merge_subscription',
+            'sp_MSadd_mergereplcommand', 'sp_MSadd_mergesubentry_indistdb', 'sp_MSadd_publication', 'sp_MSadd_qreader_agent',
+            'sp_MSadd_qreader_history', 'sp_MSadd_repl_alert', 'sp_MSadd_repl_command', 'sp_MSadd_repl_commands27hp', 'sp_MSadd_repl_error',
+            'sp_MSadd_replcmds_mcit', 'sp_MSadd_replmergealert', 'sp_MSadd_snapshot_agent', 'sp_MSadd_snapshot_history', 'sp_MSadd_subscriber_info',
+            'sp_MSadd_subscriber_schedule', 'sp_MSadd_subscription', 'sp_MSadd_subscription_3rd', 'sp_MSadd_tracer_history', 'sp_MSadd_tracer_token',
+            'sp_MSaddanonymousreplica', 'sp_MSadddynamicsnapshotjobatdistributor', 'sp_MSaddguidcolumn', 'sp_MSaddguidindex', 'sp_MSaddinitialarticle',
+            'sp_MSaddinitialpublication', 'sp_MSaddinitialschemaarticle', 'sp_MSaddinitialsubscription', 'sp_MSaddlightweightmergearticle',
+            'sp_MSaddmergedynamicsnapshotjob', 'sp_MSaddmergetriggers', 'sp_MSaddmergetriggers_from_template', 'sp_MSaddmergetriggers_internal',
+            'sp_MSaddpeerlsn', 'sp_MSaddsubscriptionarticles', 'sp_MSadjust_pub_identity', 'sp_MSagent_retry_stethoscope', 'sp_MSagent_stethoscope',
+            'sp_MSallocate_new_identity_range', 'sp_MSalreadyhavegeneration', 'sp_MSanonymous_status', 'sp_MSarticlecleanup',
+            'sp_MSbrowsesnapshotfolder', 'sp_MScache_agent_parameter', 'sp_MScdc_capture_job', 'sp_MScdc_cleanup_job', 'sp_MScdc_db_ddl_event',
+            'sp_MScdc_ddl_event', 'sp_MScdc_logddl', 'sp_MSchange_article', 'sp_MSchange_distribution_agent_properties',
+            'sp_MSchange_logreader_agent_properties', 'sp_MSchange_merge_agent_properties', 'sp_MSchange_mergearticle', 'sp_MSchange_mergepublication',
+            'sp_MSchange_originatorid', 'sp_MSchange_priority', 'sp_MSchange_publication', 'sp_MSchange_retention', 'sp_MSchange_retention_period_unit',
+            'sp_MSchange_snapshot_agent_properties', 'sp_MSchange_subscription_dts_info', 'sp_MSchangearticleresolver',
+            'sp_MSchangedynamicsnapshotjobatdistributor', 'sp_MSchangedynsnaplocationatdistributor', 'sp_MSchangeobjectowner',
+            'sp_MScheck_agent_instance', 'sp_MScheck_Jet_Subscriber', 'sp_MScheck_logicalrecord_metadatamatch', 'sp_MScheck_merge_subscription_count',
+            'sp_MScheck_pub_identity', 'sp_MScheck_pull_access', 'sp_MScheck_snapshot_agent', 'sp_MScheck_subscription', 'sp_MScheck_subscription_expiry',
+            'sp_MScheck_subscription_partition', 'sp_MScheck_tran_retention', 'sp_MScheckexistsgeneration', 'sp_MScheckexistsrecguid',
+            'sp_MScheckfailedprevioussync', 'sp_MScheckidentityrange', 'sp_MScheckIsPubOfSub', 'sp_MSchecksharedagentforpublication',
+            'sp_MSchecksnapshotstatus', 'sp_MScleanup_agent_entry', 'sp_MScleanup_conflict', 'sp_MScleanup_publication_ADinfo',
+            'sp_MScleanup_subscription_distside_entry', 'sp_MScleanupdynamicsnapshotfolder', 'sp_MScleanupdynsnapshotvws', 'sp_MSCleanupForPullReinit',
+            'sp_MScleanupmergepublisher_internal', 'sp_MSclear_dynamic_snapshot_location', 'sp_MSclearresetpartialsnapshotprogressbit',
+            'sp_MScomputelastsentgen', 'sp_MScomputemergearticlescreationorder', 'sp_MScomputemergeunresolvedrefs', 'sp_MSconflicttableexists',
+            'sp_MScreate_all_article_repl_views', 'sp_MScreate_article_repl_views', 'sp_MScreate_dist_tables', 'sp_MScreate_logical_record_views',
+            'sp_MScreate_sub_tables', 'sp_MScreate_tempgenhistorytable', 'sp_MScreatedisabledmltrigger', 'sp_MScreatedummygeneration',
+            'sp_MScreateglobalreplica', 'sp_MScreatelightweightinsertproc', 'sp_MScreatelightweightmultipurposeproc',
+            'sp_MScreatelightweightprocstriggersconstraints', 'sp_MScreatelightweightupdateproc', 'sp_MScreatemergedynamicsnapshot',
+            'sp_MScreateretry', 'sp_MSdbuseraccess', 'sp_MSdbuserpriv', 'sp_MSdefer_check', 'sp_MSdelete_tracer_history', 'sp_MSdeletefoldercontents',
+            'sp_MSdeletemetadataactionrequest', 'sp_MSdeletepeerconflictrow', 'sp_MSdeleteretry', 'sp_MSdeletetranconflictrow', 'sp_MSdelgenzero',
+            'sp_MSdelrow', 'sp_MSdelrowsbatch', 'sp_MSdelrowsbatch_downloadonly', 'sp_MSdelsubrows', 'sp_MSdelsubrowsbatch', 'sp_MSdependencies',
+            'sp_MSdetect_nonlogged_shutdown', 'sp_MSdetectinvalidpeerconfiguration', 'sp_MSdetectinvalidpeersubscription', 'sp_MSdist_activate_auto_sub',
+            'sp_MSdist_adjust_identity', 'sp_MSdistpublisher_cleanup', 'sp_MSdistribution_counters', 'sp_MSdistributoravailable',
+            'sp_MSdodatabasesnapshotinitiation', 'sp_MSdopartialdatabasesnapshotinitiation', 'sp_MSdrop_6x_publication', 'sp_MSdrop_6x_replication_agent',
+            'sp_MSdrop_anonymous_entry', 'sp_MSdrop_article', 'sp_MSdrop_distribution_agent', 'sp_MSdrop_distribution_agentid_dbowner_proxy',
+            'sp_MSdrop_dynamic_snapshot_agent', 'sp_MSdrop_logreader_agent', 'sp_MSdrop_merge_agent', 'sp_MSdrop_merge_subscription',
+            'sp_MSdrop_publication', 'sp_MSdrop_qreader_history', 'sp_MSdrop_snapshot_agent', 'sp_MSdrop_snapshot_dirs', 'sp_MSdrop_subscriber_info',
+            'sp_MSdrop_subscription', 'sp_MSdrop_subscription_3rd', 'sp_MSdrop_tempgenhistorytable', 'sp_MSdroparticleconstraints',
+            'sp_MSdroparticletombstones', 'sp_MSdropconstraints', 'sp_MSdropdynsnapshotvws', 'sp_MSdropfkreferencingarticle', 'sp_MSdropmergearticle',
+            'sp_MSdropmergedynamicsnapshotjob', 'sp_MSdropretry', 'sp_MSdroptemptable', 'sp_MSdummyupdate', 'sp_MSdummyupdate_logicalrecord',
+            'sp_MSdummyupdate90', 'sp_MSdummyupdatelightweight', 'sp_MSdynamicsnapshotjobexistsatdistributor', 'sp_MSenable_publication_for_het_sub',
+            'sp_MSensure_single_instance', 'sp_MSenum_distribution', 'sp_MSenum_distribution_s', 'sp_MSenum_distribution_sd',
+            'sp_MSenum_logicalrecord_changes', 'sp_MSenum_logreader', 'sp_MSenum_logreader_s', 'sp_MSenum_logreader_sd', 'sp_MSenum_merge',
+            'sp_MSenum_merge_agent_properties', 'sp_MSenum_merge_s', 'sp_MSenum_merge_sd', 'sp_MSenum_merge_subscriptions',
+            'sp_MSenum_merge_subscriptions_90_publication', 'sp_MSenum_merge_subscriptions_90_publisher', 'sp_MSenum_metadataaction_requests',
+            'sp_MSenum_qreader', 'sp_MSenum_qreader_s', 'sp_MSenum_qreader_sd', 'sp_MSenum_replication_agents', 'sp_MSenum_replication_job',
+            'sp_MSenum_replqueues', 'sp_MSenum_replsqlqueues', 'sp_MSenum_snapshot', 'sp_MSenum_snapshot_s', 'sp_MSenum_snapshot_sd',
+            'sp_MSenum_subscriptions', 'sp_MSenumallpublications', 'sp_MSenumallsubscriptions', 'sp_MSenumarticleslightweight', 'sp_MSenumchanges',
+            'sp_MSenumchanges_belongtopartition', 'sp_MSenumchanges_notbelongtopartition', 'sp_MSenumchangesdirect', 'sp_MSenumchangeslightweight',
+            'sp_MSenumcolumns', 'sp_MSenumcolumnslightweight', 'sp_MSenumdeletes_forpartition', 'sp_MSenumdeleteslightweight', 'sp_MSenumdeletesmetadata',
+            'sp_MSenumdistributionagentproperties', 'sp_MSenumerate_PAL', 'sp_MSenumgenerations', 'sp_MSenumgenerations90', 'sp_MSenumpartialchanges',
+            'sp_MSenumpartialchangesdirect', 'sp_MSenumpartialdeletes', 'sp_MSenumpubreferences', 'sp_MSenumreplicas', 'sp_MSenumreplicas90',
+            'sp_MSenumretries', 'sp_MSenumschemachange', 'sp_MSenumsubscriptions', 'sp_MSenumthirdpartypublicationvendornames',
+            'sp_MSestimatemergesnapshotworkload', 'sp_MSestimatesnapshotworkload', 'sp_MSevalsubscriberinfo',
+            'sp_MSevaluate_change_membership_for_all_articles_in_pubid', 'sp_MSevaluate_change_membership_for_pubid',
+            'sp_MSevaluate_change_membership_for_row', 'sp_MSexecwithlsnoutput', 'sp_MSfast_delete_trans', 'sp_MSfetchAdjustidentityrange',
+            'sp_MSfetchidentityrange', 'sp_MSfillupmissingcols', 'sp_MSfilterclause', 'sp_MSfix_6x_tasks', 'sp_MSfixlineageversions',
+            'sp_MSFixSubColumnBitmaps', 'sp_MSfixupbeforeimagetables', 'sp_MSflush_access_cache', 'sp_MSforce_drop_distribution_jobs',
+            'sp_MSforcereenumeration', 'sp_MSforeach_worker', 'sp_MSforeachdb', 'sp_MSforeachtable', 'sp_MSgenerateexpandproc', 'sp_MSget_agent_names',
+            'sp_MSget_attach_state', 'sp_MSget_DDL_after_regular_snapshot', 'sp_MSget_dynamic_snapshot_location', 'sp_MSget_identity_range_info',
+            'sp_MSget_jobstate', 'sp_MSget_last_transaction', 'sp_MSget_latest_peerlsn', 'sp_MSget_load_hint', 'sp_MSget_log_shipping_new_sessionid',
+            'sp_MSget_logicalrecord_lineage', 'sp_MSget_max_used_identity', 'sp_MSget_min_seqno', 'sp_MSget_MSmerge_rowtrack_colinfo',
+            'sp_MSget_new_xact_seqno', 'sp_MSget_oledbinfo', 'sp_MSget_partitionid_eval_proc', 'sp_MSget_publication_from_taskname',
+            'sp_MSget_publisher_rpc', 'sp_MSget_repl_cmds_anonymous', 'sp_MSget_repl_commands', 'sp_MSget_repl_error', 'sp_MSget_session_statistics',
+            'sp_MSget_shared_agent', 'sp_MSget_snapshot_history', 'sp_MSget_subscriber_partition_id', 'sp_MSget_subscription_dts_info',
+            'sp_MSget_subscription_guid', 'sp_MSget_synctran_commands', 'sp_MSget_type_wrapper', 'sp_MSgetagentoffloadinfo', 'sp_MSgetalertinfo',
+            'sp_MSgetalternaterecgens', 'sp_MSgetarticlereinitvalue', 'sp_MSgetchangecount', 'sp_MSgetconflictinsertproc', 'sp_MSgetconflicttablename',
+            'sp_MSGetCurrentPrincipal', 'sp_MSgetdatametadatabatch', 'sp_MSgetdbversion', 'sp_MSgetdynamicsnapshotapplock',
+            'sp_MSgetdynsnapvalidationtoken', 'sp_MSgetisvalidwindowsloginfromdistributor', 'sp_MSgetlastrecgen', 'sp_MSgetlastsentgen',
+            'sp_MSgetlastsentrecgens', 'sp_MSgetlastupdatedtime', 'sp_MSgetlightweightmetadatabatch', 'sp_MSgetmakegenerationapplock',
+            'sp_MSgetmakegenerationapplock_90', 'sp_MSgetmaxbcpgen', 'sp_MSgetmaxsnapshottimestamp', 'sp_MSgetmergeadminapplock',
+            'sp_MSgetmetadata_changedlogicalrecordmembers', 'sp_MSgetmetadatabatch', 'sp_MSgetmetadatabatch90', 'sp_MSgetmetadatabatch90new',
+            'sp_MSgetonerow', 'sp_MSgetonerowlightweight', 'sp_MSgetpeerconflictrow', 'sp_MSgetpeerlsns', 'sp_MSgetpeertopeercommands',
+            'sp_MSgetpeerwinnerrow', 'sp_MSgetpubinfo', 'sp_MSgetreplicainfo', 'sp_MSgetreplicastate', 'sp_MSgetrowmetadata',
+            'sp_MSgetrowmetadatalightweight', 'sp_MSGetServerProperties', 'sp_MSgetsetupbelong_cost', 'sp_MSgetsubscriberinfo',
+            'sp_MSgetsupportabilitysettings', 'sp_MSgettrancftsrcrow', 'sp_MSgettranconflictrow', 'sp_MSgetversion', 'sp_MSgrantconnectreplication',
+            'sp_MShaschangeslightweight', 'sp_MShasdbaccess', 'sp_MShelp_article', 'sp_MShelp_distdb', 'sp_MShelp_distribution_agentid',
+            'sp_MShelp_identity_property', 'sp_MShelp_logreader_agentid', 'sp_MShelp_merge_agentid', 'sp_MShelp_profile', 'sp_MShelp_profilecache',
+            'sp_MShelp_publication', 'sp_MShelp_repl_agent', 'sp_MShelp_replication_status', 'sp_MShelp_replication_table', 'sp_MShelp_snapshot_agent',
+            'sp_MShelp_snapshot_agentid', 'sp_MShelp_subscriber_info', 'sp_MShelp_subscription', 'sp_MShelp_subscription_status', 'sp_MShelpcolumns',
+            'sp_MShelpconflictpublications', 'sp_MShelpcreatebeforetable', 'sp_MShelpdestowner', 'sp_MShelpdynamicsnapshotjobatdistributor',
+            'sp_MShelpfulltextindex', 'sp_MShelpfulltextscript', 'sp_MShelpindex', 'sp_MShelplogreader_agent', 'sp_MShelpmergearticles',
+            'sp_MShelpmergeconflictcounts', 'sp_MShelpmergedynamicsnapshotjob', 'sp_MShelpmergeidentity', 'sp_MShelpmergeschemaarticles',
+            'sp_MShelpobjectpublications', 'sp_MShelpreplicationtriggers', 'sp_MShelpsnapshot_agent', 'sp_MShelpsummarypublication',
+            'sp_MShelptracertokenhistory', 'sp_MShelptracertokens', 'sp_MShelptranconflictcounts', 'sp_MShelptype', 'sp_MShelpvalidationdate',
+            'sp_MSIfExistsSubscription', 'sp_MSindexspace', 'sp_MSinit_publication_access', 'sp_MSinit_subscription_agent', 'sp_MSinitdynamicsubscriber',
+            'sp_MSinsert_identity', 'sp_MSinsertdeleteconflict', 'sp_MSinserterrorlineage', 'sp_MSinsertgenerationschemachanges', 'sp_MSinsertgenhistory',
+            'sp_MSinsertlightweightschemachange', 'sp_MSinsertschemachange', 'sp_MSinvalidate_snapshot', 'sp_MSisnonpkukupdateinconflict',
+            'sp_MSispeertopeeragent', 'sp_MSispkupdateinconflict', 'sp_MSispublicationqueued', 'sp_MSisreplmergeagent', 'sp_MSissnapshotitemapplied',
+            'sp_MSkilldb', 'sp_MSlock_auto_sub', 'sp_MSlock_distribution_agent', 'sp_MSlocktable', 'sp_MSloginmappings', 'sp_MSmakearticleprocs',
+            'sp_MSmakebatchinsertproc', 'sp_MSmakebatchupdateproc', 'sp_MSmakeconflictinsertproc', 'sp_MSmakectsview', 'sp_MSmakedeleteproc',
+            'sp_MSmakedynsnapshotvws', 'sp_MSmakeexpandproc', 'sp_MSmakegeneration', 'sp_MSmakeinsertproc', 'sp_MSmakemetadataselectproc',
+            'sp_MSmakeselectproc', 'sp_MSmakesystableviews', 'sp_MSmakeupdateproc', 'sp_MSmap_partitionid_to_generations', 'sp_MSmarkreinit',
+            'sp_MSmatchkey', 'sp_MSmerge_alterschemaonly', 'sp_MSmerge_altertrigger', 'sp_MSmerge_alterview', 'sp_MSmerge_ddldispatcher',
+            'sp_MSmerge_getgencount', 'sp_MSmerge_getgencur_public', 'sp_MSmerge_is_snapshot_required', 'sp_MSmerge_log_identity_range_allocations',
+            'sp_MSmerge_parsegenlist', 'sp_MSmerge_upgrade_subscriber', 'sp_MSmergesubscribedb', 'sp_MSmergeupdatelastsyncinfo',
+            'sp_MSneedmergemetadataretentioncleanup', 'sp_MSNonSQLDDL', 'sp_MSNonSQLDDLForSchemaDDL', 'sp_MSobjectprivs', 'sp_MSpeerapplyresponse',
+            'sp_MSpeerapplytopologyinfo', 'sp_MSpeerconflictdetection_statuscollection_applyresponse',
+            'sp_MSpeerconflictdetection_statuscollection_sendresponse', 'sp_MSpeerconflictdetection_topology_applyresponse', 'sp_MSpeerdbinfo',
+            'sp_MSpeersendresponse', 'sp_MSpeersendtopologyinfo', 'sp_MSpeertopeerfwdingexec', 'sp_MSpost_auto_proc',
+            'sp_MSpostapplyscript_forsubscriberprocs', 'sp_MSprep_exclusive', 'sp_MSprepare_mergearticle', 'sp_MSprofile_in_use',
+            'sp_MSproxiedmetadata', 'sp_MSproxiedmetadatabatch', 'sp_MSproxiedmetadatalightweight', 'sp_MSpub_adjust_identity',
+            'sp_MSpublication_access', 'sp_MSpublicationcleanup', 'sp_MSpublicationview', 'sp_MSquery_syncstates', 'sp_MSquerysubtype',
+            'sp_MSrecordsnapshotdeliveryprogress', 'sp_MSreenable_check', 'sp_MSrefresh_anonymous', 'sp_MSrefresh_publisher_idrange',
+            'sp_MSregenerate_mergetriggersprocs', 'sp_MSregisterdynsnapseqno', 'sp_MSregistermergesnappubid', 'sp_MSregistersubscription',
+            'sp_MSreinit_failed_subscriptions', 'sp_MSreinit_hub', 'sp_MSreinit_subscription', 'sp_MSreinitoverlappingmergepublications',
+            'sp_MSreleasedynamicsnapshotapplock', 'sp_MSreleasemakegenerationapplock', 'sp_MSreleasemergeadminapplock', 'sp_MSreleaseSlotLock',
+            'sp_MSreleasesnapshotdeliverysessionlock', 'sp_MSremove_mergereplcommand', 'sp_MSremoveoffloadparameter', 'sp_MSrepl_agentstatussummary',
+            'sp_MSrepl_backup_complete', 'sp_MSrepl_backup_start', 'sp_MSrepl_check_publisher', 'sp_MSrepl_createdatatypemappings',
+            'sp_MSrepl_distributionagentstatussummary', 'sp_MSrepl_dropdatatypemappings', 'sp_MSrepl_enumarticlecolumninfo',
+            'sp_MSrepl_enumpublications', 'sp_MSrepl_enumpublishertables', 'sp_MSrepl_enumsubscriptions', 'sp_MSrepl_enumtablecolumninfo',
+            'sp_MSrepl_FixPALRole', 'sp_MSrepl_getdistributorinfo', 'sp_MSrepl_getpkfkrelation', 'sp_MSrepl_gettype_mappings',
+            'sp_MSrepl_helparticlermo', 'sp_MSrepl_init_backup_lsns', 'sp_MSrepl_isdbowner', 'sp_MSrepl_IsLastPubInSharedSubscription',
+            'sp_MSrepl_IsUserInAnyPAL', 'sp_MSrepl_linkedservers_rowset', 'sp_MSrepl_mergeagentstatussummary', 'sp_MSrepl_PAL_rolecheck',
+            'sp_MSrepl_raiserror', 'sp_MSrepl_schema', 'sp_MSrepl_setNFR', 'sp_MSrepl_snapshot_helparticlecolumns',
+            'sp_MSrepl_snapshot_helppublication', 'sp_MSrepl_startup_internal', 'sp_MSrepl_subscription_rowset', 'sp_MSrepl_testadminconnection',
+            'sp_MSrepl_testconnection', 'sp_MSreplagentjobexists', 'sp_MSreplcheck_permission', 'sp_MSreplcheck_pull', 'sp_MSreplcheck_subscribe',
+            'sp_MSreplcheck_subscribe_withddladmin', 'sp_MSreplcheckoffloadserver', 'sp_MSreplcopyscriptfile', 'sp_MSreplraiserror',
+            'sp_MSreplremoveuncdir', 'sp_MSreplupdateschema', 'sp_MSrequestreenumeration', 'sp_MSrequestreenumeration_lightweight',
+            'sp_MSreset_attach_state', 'sp_MSreset_queued_reinit', 'sp_MSreset_subscription', 'sp_MSreset_subscription_seqno',
+            'sp_MSreset_synctran_bit', 'sp_MSreset_transaction', 'sp_MSresetsnapshotdeliveryprogress', 'sp_MSrestoresavedforeignkeys',
+            'sp_MSretrieve_publication_attributes', 'sp_MSscript_article_view', 'sp_MSscript_dri', 'sp_MSscript_pub_upd_trig',
+            'sp_MSscript_sync_del_proc', 'sp_MSscript_sync_del_trig', 'sp_MSscript_sync_ins_proc', 'sp_MSscript_sync_ins_trig',
+            'sp_MSscript_sync_upd_proc', 'sp_MSscript_sync_upd_trig', 'sp_MSscriptcustomdelproc', 'sp_MSscriptcustominsproc',
+            'sp_MSscriptcustomupdproc', 'sp_MSscriptdatabase', 'sp_MSscriptdb_worker', 'sp_MSscriptforeignkeyrestore', 'sp_MSscriptsubscriberprocs',
+            'sp_MSscriptviewproc', 'sp_MSsendtosqlqueue', 'sp_MSset_dynamic_filter_options', 'sp_MSset_logicalrecord_metadata',
+            'sp_MSset_new_identity_range', 'sp_MSset_oledb_prop', 'sp_MSset_snapshot_xact_seqno', 'sp_MSset_sub_guid',
+            'sp_MSset_subscription_properties', 'sp_MSsetaccesslist', 'sp_MSsetalertinfo', 'sp_MSsetartprocs', 'sp_MSsetbit',
+            'sp_MSsetconflictscript', 'sp_MSsetconflicttable', 'sp_MSsetcontext_bypasswholeddleventbit', 'sp_MSsetcontext_replagent',
+            'sp_MSsetgentozero', 'sp_MSsetlastrecgen', 'sp_MSsetlastsentgen', 'sp_MSsetreplicainfo', 'sp_MSsetreplicaschemaversion',
+            'sp_MSsetreplicastatus', 'sp_MSsetrowmetadata', 'sp_MSSetServerProperties', 'sp_MSsetsubscriberinfo', 'sp_MSsettopology',
+            'sp_MSsetup_identity_range', 'sp_MSsetup_partition_groups', 'sp_MSsetup_use_partition_groups', 'sp_MSsetupbelongs',
+            'sp_MSsetupnosyncsubwithlsnatdist', 'sp_MSsetupnosyncsubwithlsnatdist_cleanup', 'sp_MSsetupnosyncsubwithlsnatdist_helper',
+            'sp_MSSharedFixedDisk', 'sp_MSSQLDMO70_version', 'sp_MSSQLDMO80_version', 'sp_MSSQLDMO90_version', 'sp_MSSQLOLE_version',
+            'sp_MSSQLOLE65_version', 'sp_MSstartdistribution_agent', 'sp_MSstartmerge_agent', 'sp_MSstartsnapshot_agent',
+            'sp_MSstopdistribution_agent', 'sp_MSstopmerge_agent', 'sp_MSstopsnapshot_agent', 'sp_MSsub_check_identity', 'sp_MSsub_set_identity',
+            'sp_MSsubscription_status', 'sp_MSsubscriptionvalidated', 'sp_MStablechecks', 'sp_MStablekeys', 'sp_MStablerefs', 'sp_MStablespace',
+            'sp_MStestbit', 'sp_MStran_ddlrepl', 'sp_MStran_is_snapshot_required', 'sp_MStrypurgingoldsnapshotdeliveryprogress', 'sp_MSuniquename',
+            'sp_MSunmarkifneeded', 'sp_MSunmarkreplinfo', 'sp_MSunmarkschemaobject', 'sp_MSunregistersubscription', 'sp_MSupdate_agenttype_default',
+            'sp_MSupdate_singlelogicalrecordmetadata', 'sp_MSupdate_subscriber_info', 'sp_MSupdate_subscriber_schedule',
+            'sp_MSupdate_subscriber_tracer_history', 'sp_MSupdate_subscription', 'sp_MSupdate_tracer_history', 'sp_MSupdatecachedpeerlsn',
+            'sp_MSupdategenerations_afterbcp', 'sp_MSupdategenhistory', 'sp_MSupdateinitiallightweightsubscription', 'sp_MSupdatelastsyncinfo',
+            'sp_MSupdatepeerlsn', 'sp_MSupdaterecgen', 'sp_MSupdatereplicastate', 'sp_MSupdatesysmergearticles', 'sp_MSuplineageversion',
+            'sp_MSuploadsupportabilitydata', 'sp_MSuselightweightreplication', 'sp_MSvalidate_dest_recgen', 'sp_MSvalidate_subscription',
+            'sp_MSvalidate_wellpartitioned_articles', 'sp_MSvalidatearticle', 'sp_MSwritemergeperfcounter',
+
+        ),
+        7 => array(
+            'APPLY', 'FULL', 'ALL', 'AND', 'ANY', 'BETWEEN', 'CROSS',
+            'EXISTS', 'IN', 'INNER', 'JOIN', 'LIKE', 'NOT', 'NULL', 'OR', 'OUTER', 'SOME'
+        )
+    ),
     'SYMBOLS' => array(
-        '!', '!=', '%', '&', '&&', '(', ')', '*', '+', '-', '/', '<', '<<', '<=',
+        '!', '!=', '%', '&', '&&', '(', ')', '*', '+', '-', '/', '<', '<<', '<=', ';', '::', ',', '.',
         '<=>', '<>', '=', '>', '>=', '>>', '^', '|', '||', '~'
-        ),
+    ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
         1 => false,
         2 => false,
         3 => false,
         4 => false,
-        5 => false
-        ),
+        5 => false,
+        6 => false,
+        7 => false,
+    ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #FF00FF;',
+            1 => 'color: #FF00FF;',
+            2 => 'color: #0000FF;',
             3 => 'color: #AF0000;',
-            4 => 'color: #AF0000;',
-            5 => 'color: #808080;'
-            ),
+            4 => 'color: #00AF00;',
+            5 => 'color: #AF0000;',
+            6 => 'color: #AF0000;',
+            7 => 'color: #808080;',
+        ),
         'COMMENTS' => array(
-            1 => 'color: #008080;',
-            'MULTI' => 'color: #008080;'
-            ),
+            1 => 'color: #009E00;',
+            'MULTI' => 'color: #009E00;'
+        ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
+            0 => 'color: #ff0000;'
+        ),
         'BRACKETS' => array(
             0 => 'color: #808080;'
-            ),
+        ),
         'STRINGS' => array(
-            0 => 'color: #FF0000;'
-            ),
+            0 => 'color: #FF0000;',
+            'HARD' => 'color: #FF0000;'
+        ),
+        'ESCAPE_CHAR' => array(
+            'HARD' => 'color: #FF0000;'
+        ),
         'NUMBERS' => array(
             0 => 'color: #000;'
-            ),
+        ),
         'METHODS' => array(
             1 => 'color: #202020;',
             2 => 'color: #202020;'
-            ),
+        ),
         'SYMBOLS' => array(
             0 => 'color: #808080;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
         ),
+        'REGEXPS' => array(
+            0 => 'color: #cc3333;'
+        ),
+        'SCRIPT' => array(
+        )
+    ),
     'URLS' => array(
         1 => '',
         2 => '',
         3 => '',
         4 => '',
-        5 => ''
-        ),
+        5 => '',
+        6 => '',
+        7 => '',
+    ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
         1 => '.'
-        ),
+    ),
     'REGEXPS' => array(
-        ),
+        // variables
+        0 => "[\\@]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"
+    ),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
     'SCRIPT_DELIMITERS' => array(
-        ),
+    ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
+    ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => "(?<![@\[a-zA-Z0-9\$_\|\#|^&'\"])",
+                'DISALLOWED_AFTER' => "(?![\]a-zA-Z0-9_\|%\-&;'\"])",
+            ),
+            7 => array(
+                'DISALLOWED_BEFORE' => "(?<![@\[a-zA-Z0-9\$_\|\#|^&'\"])",
+                'DISALLOWED_AFTER' => "(?![\]a-zA-Z0-9_\|%\-&;'\"])",
+            ),
         )
+    )
 );
diff --git a/htdocs/application/libraries/geshi/geshi/twig.php b/htdocs/application/libraries/geshi/geshi/twig.php
new file mode 100644
index 0000000..2936e0f
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/twig.php
@@ -0,0 +1,286 @@
+<?php
+/*************************************************************************************
+ * twig.php
+ * ----------
+ * Author: Keyvan Akbary (keyvan@kiwwito.com)
+ * Copyright: (c) 2011 Keyvan Akbary (http://www.kiwwito.com/)
+ * Release Version: 1.0.9.0
+ * Date Started: 2011/12/05
+ *
+ * Twig template language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/09/28 (1.9.0 by José Andrés Puertas y Javier Eguiluz)
+ *   - Added new tags, filters and functions
+ *   - Added regexps for variables, objects and properties
+ *   - Lots of other minor tweaks (delimites, comments, ...)
+ *
+ * 2011/12/05 (1.0.0 by Keyvan Akbary)
+ *   -  Initial Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Twig',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('{#' => '#}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //TWIG
+        //Tags
+        1 => array(
+            'autoescape',
+            'endautoescape',
+            'block',
+            'endblock',
+            'do',
+            'embed',
+            'endembed',
+            'extends',
+            'filter',
+            'endfilter',
+            'for',
+            'endfor',
+            'from',
+            'if',
+            'else',
+            'elseif',
+            'endif',
+            'import',
+            'include',
+            'macro',
+            'endmacro',
+            'raw',
+            'endraw',
+            'sandbox',
+            'set',
+            'endset',
+            'spaceless',
+            'endspaceless',
+            'use',
+            'verbatim',
+            'endverbatim',
+            'trans',
+            'endtrans',
+            'transchoice',
+            'endtranschoice'
+        ),
+        //Filters
+        2 => array(
+            'abs',
+            'batch',
+            'capitalize',
+            'convert_encoding',
+            'date',
+            'date_modify',
+            'default',
+            'escape',
+            'first',
+            'format',
+            'join',
+            'json_encode',
+            'keys',
+            'last',
+            'length',
+            'lower',
+            'merge',
+            'nl2br',
+            'number_format',
+            'replace',
+            'reverse',
+            'slice',
+            'sort',
+            'split',
+            'striptags',
+            'title',
+            'trim',
+            'upper',
+            'url_encode'
+        ),
+        //Functions
+        3 => array(
+            'attribute',
+            'cycle',
+            'dump',
+            'parent',
+            'random',
+            'range',
+            'source',
+            'template_from_string'
+        ),
+        //Tests
+        4 => array(
+            'constant',
+            'defined',
+            'divisibleby',
+            'empty',
+            'even',
+            'iterable',
+            'null',
+            'odd',
+            'sameas'
+        ),
+        //Operators
+        5 => array(
+            'in',
+            'is',
+            'and',
+            'b-and',
+            'or',
+            'b-or',
+            'b-xor',
+            'not',
+            'into',
+            'starts with',
+            'ends with',
+            'matches'
+        )
+    ),
+    'SYMBOLS' => array(
+        '{{',
+        '}}',
+        '{%',
+        '%}',
+        '+',
+        '-',
+        '/',
+        '/',
+        '*',
+        '**', //Math operators
+        '==',
+        '!=',
+        '<',
+        '>',
+        '>=',
+        '<=',
+        '===', //Logic operators
+        '..',
+        '|',
+        '~',
+        '[',
+        ']',
+        '.',
+        '?',
+        ':',
+        '(',
+        ')', //Other
+        '=' //HTML (attributes)
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        //Twig
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;', //Tags
+            2 => 'color: #008000;', //Filters
+            3 => 'color: #0600FF;', //Functions
+            4 => 'color: #804040;', //Tests
+            5 => 'color: #008000;'
+        ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #008080; font-style: italic;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #D36900;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+        ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #D36900;'
+        ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #009000;'
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #00aaff;',
+            1 => 'color: #00aaff;'
+        )
+    ),
+    'URLS' => array(
+        1 => 'http://twig.sensiolabs.org/doc/tags/{FNAMEL}.html',
+        2 => 'http://twig.sensiolabs.org/doc/filters/{FNAMEL}.html',
+        3 => 'http://twig.sensiolabs.org/doc/functions/{FNAMEL}.html',
+        4 => 'http://twig.sensiolabs.org/doc/tests/{FNAMEL}.html',
+        5 => '',
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+    ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "([[:space:]])([a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+        ),
+        1 => array(
+            GESHI_SEARCH => "\.([a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '.\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+        ),
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '{{' => '}}',
+            '{%' => '%}'
+        ),
+        1 => array(
+            '{#' => '#}',
+        )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true
+    ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array()
+    )
+);
diff --git a/htdocs/application/libraries/geshi/geshi/typoscript.php b/htdocs/application/libraries/geshi/geshi/typoscript.php
index c548866..c52ba91 100644
--- a/htdocs/application/libraries/geshi/geshi/typoscript.php
+++ b/htdocs/application/libraries/geshi/geshi/typoscript.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Jan-Philipp Halle (typo3@jphalle.de)
  * Copyright: (c) 2005 Jan-Philipp Halle (http://www.jphalle.de/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/07/29
  *
  * TypoScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/unicon.php b/htdocs/application/libraries/geshi/geshi/unicon.php
index 7bc377b..bd56f50 100644
--- a/htdocs/application/libraries/geshi/geshi/unicon.php
+++ b/htdocs/application/libraries/geshi/geshi/unicon.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Matt Oates (mattoates@gmail.com)
  * Copyright: (c) 2010 Matt Oates (http://mattoates.co.uk)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/04/20
  *
  * Unicon the Unified Extended Dialect of Icon language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/upc.php b/htdocs/application/libraries/geshi/geshi/upc.php
index b1e873e..0b8b485 100644
--- a/htdocs/application/libraries/geshi/geshi/upc.php
+++ b/htdocs/application/libraries/geshi/geshi/upc.php
@@ -8,7 +8,7 @@
  *  - Jack Lloyd (lloyd@randombit.net)
  *  - Michael Mol (mikemol@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * UPC language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/urbi.php b/htdocs/application/libraries/geshi/geshi/urbi.php
index ec2aec4..f87e6c1 100644
--- a/htdocs/application/libraries/geshi/geshi/urbi.php
+++ b/htdocs/application/libraries/geshi/geshi/urbi.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Alexandre Morgand (morgand.alexandre@gmail.com)
  * Copyright: (c) 2011 Morgand (http://gostai.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2011/09/10
  *
  * Urbi language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/uscript.php b/htdocs/application/libraries/geshi/geshi/uscript.php
index f76a2dc..216eaff 100644
--- a/htdocs/application/libraries/geshi/geshi/uscript.php
+++ b/htdocs/application/libraries/geshi/geshi/uscript.php
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: pospi (pospi@spadgos.com)
  * Copyright: (c) 2007 pospi (http://pospi.spadgos.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/05/21
  *
  * UnrealScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/vala.php b/htdocs/application/libraries/geshi/geshi/vala.php
index a823dbf..fd8ce68 100644
--- a/htdocs/application/libraries/geshi/geshi/vala.php
+++ b/htdocs/application/libraries/geshi/geshi/vala.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Nicolas Joseph (nicolas.joseph@valaide.org)
  * Copyright: (c) 2009 Nicolas Joseph
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/04/29
  *
  * Vala language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/vb.php b/htdocs/application/libraries/geshi/geshi/vb.php
index bcfe614..2d2a7b6 100644
--- a/htdocs/application/libraries/geshi/geshi/vb.php
+++ b/htdocs/application/libraries/geshi/geshi/vb.php
@@ -5,7 +5,7 @@
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org),
  *                     Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/08/30
  *
  * Visual Basic language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/vbnet.php b/htdocs/application/libraries/geshi/geshi/vbnet.php
index e4d1464..058b9c4 100644
--- a/htdocs/application/libraries/geshi/geshi/vbnet.php
+++ b/htdocs/application/libraries/geshi/geshi/vbnet.php
@@ -4,7 +4,7 @@
  * ---------
  * Author: Alan Juden (alan@judenware.org)
  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/06/04
  *
  * VB.NET language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/vbscript.php b/htdocs/application/libraries/geshi/geshi/vbscript.php
index 6db3bbd..4f73664 100644
--- a/htdocs/application/libraries/geshi/geshi/vbscript.php
+++ b/htdocs/application/libraries/geshi/geshi/vbscript.php
@@ -6,7 +6,7 @@
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org),
  *                     Nigel McNie (http://qbnz.com/highlighter),
  *                     Rory Prendergast (http://www.tanium.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2012/08/20
  *
  * VBScript language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/vedit.php b/htdocs/application/libraries/geshi/geshi/vedit.php
index 72f4b53..fa79420 100644
--- a/htdocs/application/libraries/geshi/geshi/vedit.php
+++ b/htdocs/application/libraries/geshi/geshi/vedit.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Pauli Lindgren (pauli0212@yahoo.com)
  * Copyright: (c) 2009 Pauli Lindgren (http://koti.mbnet.fi/pkl/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/12/16
  *
  * Vedit macro language language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/verilog.php b/htdocs/application/libraries/geshi/geshi/verilog.php
index 77e5927..8632304 100644
--- a/htdocs/application/libraries/geshi/geshi/verilog.php
+++ b/htdocs/application/libraries/geshi/geshi/verilog.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Günter Dannoritzer <dannoritzer@web.de>
  * Copyright: (C) 2008 Günter Dannoritzer
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/05/28
  *
  * Verilog language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/vhdl.php b/htdocs/application/libraries/geshi/geshi/vhdl.php
index c89a098..edb0fd6 100644
--- a/htdocs/application/libraries/geshi/geshi/vhdl.php
+++ b/htdocs/application/libraries/geshi/geshi/vhdl.php
@@ -6,7 +6,7 @@
  * Contributors:
  *  - Kevin Thibedeau (kevinpt@yahoo.com)
  * Copyright: (c) 2005 Alexander Krause
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/06/15
  *
  * VHDL (VHSICADL, very high speed integrated circuit HDL) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/vim.php b/htdocs/application/libraries/geshi/geshi/vim.php
index 4353943..39ec831 100644
--- a/htdocs/application/libraries/geshi/geshi/vim.php
+++ b/htdocs/application/libraries/geshi/geshi/vim.php
@@ -6,7 +6,7 @@
  * Contributors:
  *  - Laurent Peuch (psycojoker@gmail.com)
  * Copyright: (c) 2008 Swaroop C H (http://www.swaroopch.com)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/10/19
  *
  * Vim scripting language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/visualfoxpro.php b/htdocs/application/libraries/geshi/geshi/visualfoxpro.php
index e3cd748..9e43ead 100644
--- a/htdocs/application/libraries/geshi/geshi/visualfoxpro.php
+++ b/htdocs/application/libraries/geshi/geshi/visualfoxpro.php
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Roberto Armellin (r.armellin@tin.it)
  * Copyright: (c) 2004 Roberto Armellin, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/09/17
  *
  * Visual FoxPro language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/visualprolog.php b/htdocs/application/libraries/geshi/geshi/visualprolog.php
index 1a05e75..72ddb45 100644
--- a/htdocs/application/libraries/geshi/geshi/visualprolog.php
+++ b/htdocs/application/libraries/geshi/geshi/visualprolog.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Thomas Linder Puls (puls@pdc.dk)
  * Copyright: (c) 2008 Thomas Linder Puls (puls@pdc.dk)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/11/20
  *
  * Visual Prolog language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/whitespace.php b/htdocs/application/libraries/geshi/geshi/whitespace.php
index 4a6957b..47ca8fd 100644
--- a/htdocs/application/libraries/geshi/geshi/whitespace.php
+++ b/htdocs/application/libraries/geshi/geshi/whitespace.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2009/10/31
  *
  * Whitespace language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/whois.php b/htdocs/application/libraries/geshi/geshi/whois.php
index 0eebde2..5ca47e1 100644
--- a/htdocs/application/libraries/geshi/geshi/whois.php
+++ b/htdocs/application/libraries/geshi/geshi/whois.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Benny Baumann (BenBE@geshi.org)
  * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/09/14
  *
  * Whois response (RPSL format) language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/winbatch.php b/htdocs/application/libraries/geshi/geshi/winbatch.php
index bae96a0..aa1ce52 100644
--- a/htdocs/application/libraries/geshi/geshi/winbatch.php
+++ b/htdocs/application/libraries/geshi/geshi/winbatch.php
@@ -4,7 +4,7 @@
  * ------------
  * Author: Craig Storey (storey.craig@gmail.com)
  * Copyright: (c) 2004 Craig Storey (craig.xcottawa.ca)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2006/05/19
  *
  * WinBatch language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/xbasic.php b/htdocs/application/libraries/geshi/geshi/xbasic.php
index 4f9cd80..45af710 100644
--- a/htdocs/application/libraries/geshi/geshi/xbasic.php
+++ b/htdocs/application/libraries/geshi/geshi/xbasic.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Jos� Gabriel Moya Yang�ela (josemoya@gmail.com)
  * Copyright: (c) 2005 Jos� Gabriel Moya Yang�ela (http://aprenderadesaprender.6te.net)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2005/11/23
  *
  * XBasic language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/xml.php b/htdocs/application/libraries/geshi/geshi/xml.php
index b7a416e..a6a145f 100644
--- a/htdocs/application/libraries/geshi/geshi/xml.php
+++ b/htdocs/application/libraries/geshi/geshi/xml.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2004/09/01
  *
  * XML language file for GeSHi. Based on the idea/file by Christian Weiske
diff --git a/htdocs/application/libraries/geshi/geshi/xojo.php b/htdocs/application/libraries/geshi/geshi/xojo.php
new file mode 100644
index 0000000..e067acf
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/xojo.php
@@ -0,0 +1,279 @@
+<?php
+/*************************************************************************************
+ * xojo.php
+ * --------
+ * Author: Dr Garry Pettet (contact@garrypettet.com)
+ * Copyright: (c) 2014 Dr Garry Pettet (http://garrypettet.com)
+ * Release Version: 1.0.9.0
+ * Date Started: 2014/10/19
+ *
+ * Xojo language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2014/10/19 (1.0.8.13)
+ *  -  First Release
+ *
+ * TODO (updated 2014/10/19)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Xojo',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => '//', 3 => 'rem'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' => array(
+        1 => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE, // integers
+        2 => GESHI_NUMBER_FLT_NONSCI // floating point numbers
+    ),
+    'KEYWORDS' => array(
+        //Keywords
+        1 => array(
+            'AddHandler',
+            'AddressOf',
+            'Aggregates',
+            'And',
+            'Array',
+            'As',
+            'Assigns',
+            'Attributes',
+            'Break',
+            'ByRef',
+            'ByVal',
+            'Call',
+            'Case',
+            'Catch',
+            'Class',
+            'Const',
+            'Continue',
+            'CType',
+            'Declare',
+            'Delegate',
+            'Dim',
+            'Do',
+            'DownTo',
+            'Each',
+            'Else',
+            'Elseif',
+            'End',
+            'Enum',
+            'Event',
+            'Exception',
+            'Exit',
+            'Extends',
+            'False',
+            'Finally',
+            'For',
+            'Function',
+            'Global',
+            'GoTo',
+            'Handles',
+            'If',
+            'Implements',
+            'In',
+            'Inherits',
+            'Inline68K',
+            'Interface',
+            'Is',
+            'IsA',
+            'Lib',
+            'Loop',
+            'Me',
+            'Mod',
+            'Module',
+            'Namespace',
+            'New',
+            'Next',
+            'Nil',
+            'Not',
+            'Object',
+            'Of',
+            'Optional',
+            'Or',
+            'ParamArray',
+            'Private',
+            'Property',
+            'Protected',
+            'Public',
+            'Raise',
+            'RaiseEvent',
+            'Rect',
+            'Redim',
+            'RemoveHandler',
+            'Return',
+            'Select',
+            'Self',
+            'Shared',
+            'Soft',
+            'Static',
+            'Step',
+            'Sub',
+            'Super',
+            'Then',
+            'To',
+            'True',
+            'Try',
+            'Until',
+            'Using',
+            'Wend',
+            'While',
+            'With',
+            'WeakAddressOf',
+            'Xor'
+        ),
+        //Data Types
+        2 => array(
+            'Boolean',
+            'CFStringRef',
+            'CString',
+            'Currency',
+            'Double',
+            'Int8',
+            'Int16',
+            'Int32',
+            'Int64',
+            'Integer',
+            'OSType',
+            'PString',
+            'Ptr',
+            'Short',
+            'Single',
+            'String',
+            'Structure',
+            'UInt8',
+            'UInt16',
+            'UInt32',
+            'UInt64',
+            'UShort',
+            'WindowPtr',
+            'WString',
+            'XMLNodeType'
+        ),
+        //Compiler Directives
+        3 => array(
+            '#Bad',
+            '#Else',
+            '#Endif',
+            '#If',
+            '#Pragma',
+            '#Tag'
+        ),
+    ),
+    'SYMBOLS' => array(
+        '+',
+        '-',
+        '*',
+        '=',
+        '/',
+        '>',
+        '<',
+        '^',
+        '(',
+        ')',
+        '.'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',  // keywords
+            2 => 'color: #0000FF;',  // primitive data types
+            3 => 'color: #0000FF;',  // compiler commands
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #7F0000;',
+            2 => 'color: #7F0000;',
+            3 => 'color: #7F0000;',
+            'MULTI' => 'color: #7F0000;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #6500FE;'
+        ),
+        'NUMBERS' => array(
+            1 => 'color: #326598;', // integers
+            2 => 'color: #006532;', // floating point numbers
+        ),
+        'METHODS' => array(
+            1 => 'color: #000000;'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+        ),
+        'REGEXPS' => array(
+            1 => 'color: #326598;', // &h hex numbers
+            2 => 'color: #326598;', // &b hex numbers
+            3 => 'color: #326598;', // &o hex numbers
+        ),
+        'SCRIPT' => array()
+    ),
+    'URLS' => array(
+        1 => 'http://docs.xojo.com/index.php/{FNAMEU}',
+        2 => 'http://docs.xojo.com/index.php/{FNAMEU}',
+        3 => ''
+    ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+    ),
+    'REGEXPS' => array(
+        1 => array( // &h numbers
+            // search for &h, then any number of letters a-f or numbers 0-9
+            GESHI_SEARCH => '(&amp;h[0-9a-fA-F]*\b)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+        ),
+        2 => array( // &b numbers
+            // search for &b, then any number of 0-1 digits
+            GESHI_SEARCH => '(&amp;b[0-1]*\b)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+        ),
+        3 => array( // &o octal numbers
+            // search for &o, then any number of 0-7 digits
+            GESHI_SEARCH => '(&amp;o[0-7]*\b)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+        )
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/htdocs/application/libraries/geshi/geshi/xorg_conf.php b/htdocs/application/libraries/geshi/geshi/xorg_conf.php
index 35718be..92b276b 100644
--- a/htdocs/application/libraries/geshi/geshi/xorg_conf.php
+++ b/htdocs/application/libraries/geshi/geshi/xorg_conf.php
@@ -4,7 +4,7 @@
  * ----------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2008/06/18
  *
  * xorg.conf language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/xpp.php b/htdocs/application/libraries/geshi/geshi/xpp.php
index 4ea5e22..d249c48 100644
--- a/htdocs/application/libraries/geshi/geshi/xpp.php
+++ b/htdocs/application/libraries/geshi/geshi/xpp.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Simon Butcher (simon@butcher.name)
  * Copyright: (c) 2007 Simon Butcher (http://simon.butcher.name/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/02/27
  *
  * Axapta/Dynamics Ax X++ language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/xyscript.php b/htdocs/application/libraries/geshi/geshi/xyscript.php
new file mode 100644
index 0000000..deaaa3d
--- /dev/null
+++ b/htdocs/application/libraries/geshi/geshi/xyscript.php
@@ -0,0 +1,166 @@
+<?php
+/*************************************************************************************
+ * XYScript.php
+ * --------
+ * Author: Mithrin (mithrin@hotmail.com)
+ * Copyright: (c) 2013 Mithrin and GeSHi
+ * Release Version: 1.0.8.12
+ * Date Started: 2013/07/29
+ *
+ * XYScript language file for GeSHi.
+ *
+ * File exention .xys
+ *
+ * CHANGES
+ * -------
+ * Release 1.0. (2013/07/29)
+ * - First Release
+ *
+ * TODO
+ * ----
+ * Reference: http://www.xyplorer.com/
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi 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 General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'XYScript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+// Regular Expressions
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+// Scripting Commands
+        1 => array(
+            'abs,', 'asc,', 'assert,', 'attrstamp,', 'backupto,', 'beep,', 'box,', 'br,', 'break,', 'button,', 'catalogload,', 'catalogreport,',
+            'ceil,', 'charview,', 'chr,', 'compare,', 'confirm,', 'continue,', 'copy,', 'copyas,', 'copydata,', 'copyitem,', 'copytext,',
+            'copyto,', 'ctbicon,', 'ctbstate,', 'datediff,', 'delete,', 'download,', 'echo,', 'end,', 'eval,', 'exists,', 'exit,', 'filesize,',
+            'filetype,', 'filter,', 'floor,', 'focus,', 'folderreport,', 'format,', 'formatbytes,', 'formatdate,', 'formatlist,', 'get,',
+            'getkey,', 'getpathcomponent,', 'gettoken,', 'global,', 'goto,', 'hash,', 'hexdump,', 'hextodec,', 'highlight,', 'html,', 'incr,',
+            'input,', 'inputfile,', 'inputfolder,', 'inputselect,', 'internetflags,', 'isset,', 'isunicode,', 'listfolder,', 'listpane,', 'load,',
+            'loadsearch,', 'loadtree,', 'makecoffee,', 'md5,', 'moveas,', 'moveto,', 'msg,', 'new,', 'now,', 'open,', 'openwith,', 'perm,',
+            'popupmenu,', 'property,', 'quickfileview,', 'quote,', 'rand,', 'readfile,', 'readpv,', 'readurl,', 'recase,', 'regexmatches,',
+            'regexreplace,', 'releaseglobals,', 'rename,', 'renameitem,', 'replace,', 'replacelist,', 'report,', 'resolvepath,', 'rtfm,',
+            'rotate,', 'round,', 'run,', 'savesettings,', 'sel,', 'selectitems,', 'self,', 'selfilter,', 'seltab,', 'set,', 'setkey,',
+            'setting,', 'settingp,', 'sortby,', 'sound,', 'status,', 'step,', 'strlen,', 'strpos,', 'strrepeat,', 'sub,', 'substr,',
+            'swapnames,', 'sync,', 'tab,', 'tabset,', 'tag,', 'taglist,', 'text,', 'timestamp,', 'toolbar,', 'trim,', 'unset,',
+            'unstep,', 'urldecode,', 'urlencode,', 'utf8decode,', 'utf8encode,', 'wipe,', 'writefile,', 'writepv',
+            ),
+// Core Funtions
+        2 => array(
+            'TRUE', 'FALSE', 'NOT', 'if', 'elseIf', 'else', 'while', 'foreach', 'and', 'or', 'xor', 'Like', 'LikeI', 'UnLike', 'UnLikeI'
+            ),
+// XYplorer Native built-in variables Read-Only (Scripting only, Scripting with Portable File Associations only, Constants, UDC Open With only, Date Variables)
+        3 => array(
+            '<curpath>', '<curpath_s>', '<curpath_dos>', '<curtab>', '<curfolder>', '<curitem>', '<curitemprev>', '<curitem_dos>', '<curitempath>',
+            '<curbase>', '<curext>', '<curname>', '<cursize>', '<curver>', '<curlen>', '<focitem>', '<selitems>', '<datem yyyymmdd_hhnnss>',
+            '<date yyyymmdd_hhnnss>', ' <xy>', '<xyexe>', '<xypath>', '<xydata>', '<xycatalogs>', '<xythumbs>', '<xyicons>', '<xypane>', '<xypane1>',
+            '<xypane2>', '<xytagdat>', ' <xynewitems>', ' <xyscripts>', '<xyini>', '<xydrive>', '<xyver>', '<clipboard>', '<hwnd>', ' <pfaitem>',
+            ' <crlf>', '<tab>', ' <items>', '<item1>', '<item2>', '<base>', '<title>', '<date>', '<datem>', '<datec>', '<datea>', '<dateexif>',
+            '<date yyyy>', '<datem yyyy-mm-dd>', '<datec yyyy-mm-dd hh:nn:ss>', '<datea yymmdd_hh_nn_ss>', '<date List>', ', <datem List>',
+            '<datem +8h yyyymmdd_hhnnss>', '<datec -8d yyyymmdd>', '<date Zodiac>', '<date ISOWeek>', '<get ...>', '<prop ...>'
+            ),
+// Environment Variables (Common Windows, Administrative Windows, XYplorer only)
+        4 => array(
+            '%allusersprofile%', '%appdata%', '%commonprogramfiles%', '%programfiles%', '%systemdrive%', '%systemroot%', '%temp%', '%tmp%',
+            '%userprofile%', '%windir%', '%CLIENTNAME%', '%COMPUTERNAME%', '%FP_NO_HOST_CHECK%', '%HOMEPATH%', '%NUMBER_OF_PROCESSORS%', '%OS%',
+            '%PATHEXT%', '%PROCESSOR_ARCHITECTURE%', '%PROCESSOR_IDENTIFIER%', '%PROCESSOR_LEVEL%', '%PROCESSOR_REVISION%', '%SESSIONNAME%',
+            '%USERDOMAIN%', '%USERNAME%', '%computer%', '%desktop%', '%net%', '%recycler%', '%personal%', '%desktopreal%', '%personalreal%',
+            '%winsysdir%', '%winsysnative%', '%commonappdata%', '%commondesktop%', '%winver%', '%osbitness%'
+            ),
+    ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '<', '>',
+        '+', '-', '*', '/', '$', '%',
+        '!', '@', '&', '|', '^', '_',
+        ',', ';', '?', ':', '.', '=',
+        '++','--', '::', '!=',
+        '<=', '>=', '<<', '>>', '<<<','>>>',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0058B0;',
+            2 => 'color: #D80000;',
+            3 => 'color: #008080;',
+            4 => 'color: #F47A00;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+        'MULTI' => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #808080;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #800000;',
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3366CC;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #8080FF;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #007740;',
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            ),
+        ),
+    'URLS' => array(
+        1 => 'http://www.xyplorer.com/tour/index.php?page=scripting',
+        2 => 'http://www.xyplorer.com/xyfc/viewforum.php?f=7',
+        3 => '',
+        4 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        3 => true,
+        4 => true,
+        ),
+    'TAB_WIDTH' =>  4,
+);
diff --git a/htdocs/application/libraries/geshi/geshi/yaml.php b/htdocs/application/libraries/geshi/geshi/yaml.php
index 7e64038..252779e 100644
--- a/htdocs/application/libraries/geshi/geshi/yaml.php
+++ b/htdocs/application/libraries/geshi/geshi/yaml.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Josh Ventura (JoshV10@gmail.com)
  * Copyright: (c) 2010 Josh Ventura
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/12/14
  *
  * YAML language file for GeSHi.
@@ -83,6 +83,7 @@ $language_data = array (
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array('"'),
     'ESCAPE_CHAR' => '',
+    'NUMBERS' => array(),
     'KEYWORDS' => array(
         1 => array(
             'all','any','none', "yes", "no"
diff --git a/htdocs/application/libraries/geshi/geshi/z80.php b/htdocs/application/libraries/geshi/geshi/z80.php
index 07df46d..5c8021f 100644
--- a/htdocs/application/libraries/geshi/geshi/z80.php
+++ b/htdocs/application/libraries/geshi/geshi/z80.php
@@ -4,7 +4,7 @@
  * -------
  * Author: Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2007-2008 Benny Baumann (http://www.omorphia.de/)
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2007/02/06
  *
  * ZiLOG Z80 Assembler language file for GeSHi.
diff --git a/htdocs/application/libraries/geshi/geshi/zxbasic.php b/htdocs/application/libraries/geshi/geshi/zxbasic.php
index 1017678..d097194 100644
--- a/htdocs/application/libraries/geshi/geshi/zxbasic.php
+++ b/htdocs/application/libraries/geshi/geshi/zxbasic.php
@@ -4,7 +4,7 @@
  * -------------
  * Author: Jose Rodriguez (a.k.a. Boriel)
  * Based on Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org) Freebasic template
- * Release Version: 1.0.8.12
+ * Release Version: 1.0.9.0
  * Date Started: 2010/06/19
  *
  * ZXBasic language file for GeSHi.